Move QtConcurrent::Exception as QException back to QtCore
authorMarc Mutz <marc.mutz@kdab.com>
Mon, 27 Aug 2012 10:24:48 +0000 (12:24 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 28 Sep 2012 21:50:10 +0000 (23:50 +0200)
commit3a29976eac1ff95e663d49886dc82611a175fed9
tree31d70d25501a0f95e17b65e4c029c5c40b75610f
parent5414a9a03bec65fd180f3c29811397df14130881
Move QtConcurrent::Exception as QException back to QtCore

Leave the old name as a deprecated typedef; adapt users.

This is a prerequisite for moving QFuture back to QtCore.

Change-Id: I81dcee2c7e6eb234c16f3f42e2415ca0da3dc4f8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
18 files changed:
dist/changes-5.0.0
src/concurrent/concurrent.pro
src/concurrent/qfutureinterface.cpp
src/concurrent/qfutureinterface.h
src/concurrent/qfutureinterface_p.h
src/concurrent/qtconcurrentexception.h
src/concurrent/qtconcurrentmap.cpp
src/concurrent/qtconcurrentrunbase.h
src/concurrent/qtconcurrentthreadengine.cpp
src/concurrent/qtconcurrentthreadengine.h
src/corelib/doc/snippets/code/src_corelib_thread_qexception.cpp [moved from src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentexception.cpp with 95% similarity]
src/corelib/thread/qexception.cpp [moved from src/concurrent/qtconcurrentexception.cpp with 67% similarity]
src/corelib/thread/qexception.h [new file with mode: 0644]
src/corelib/thread/thread.pri
tests/auto/concurrent/qfuture/tst_qfuture.cpp
tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp