diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-09 09:35:03 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-02-09 12:33:10 +0100 |
| commit | 622cac50f46ff2940a02527c75b9bed4589f9988 (patch) | |
| tree | 729944e047d3be790427344cb384446b22a884ab /src/plugins/qmljseditor/qmltaskmanager.cpp | |
| parent | def4b89e7dadda7c1d5b32a0a82321c9806fa1a7 (diff) | |
| download | qt-creator-622cac50f46ff2940a02527c75b9bed4589f9988.tar.gz | |
Move QtConcurrent library into Utils.
It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.
Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/qmljseditor/qmltaskmanager.cpp')
| -rw-r--r-- | src/plugins/qmljseditor/qmltaskmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp index a6a6dfb44c..1bfb716c1f 100644 --- a/src/plugins/qmljseditor/qmltaskmanager.cpp +++ b/src/plugins/qmljseditor/qmltaskmanager.cpp @@ -45,7 +45,7 @@ #include <QtCore/QDebug> #include <QtCore/QtConcurrentRun> -#include <qtconcurrent/runextensions.h> +#include <utils/runextensions.h> using namespace QmlJS; |