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/libs/utils/utils.pro | |
| 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/libs/utils/utils.pro')
| -rw-r--r-- | src/libs/utils/utils.pro | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index 2d8ef2be45..0a1888c113 100644 --- a/src/libs/utils/utils.pro +++ b/src/libs/utils/utils.pro @@ -8,9 +8,7 @@ include(utils_dependencies.pri) include(utils-lib.pri) -greaterThan(QT_MAJOR_VERSION, 4) { - QT += concurrent -} else { +lessThan(QT_MAJOR_VERSION, 5) { # Needed for QtCore/private/qwineventnotifier_p.h win32:include(../../private_headers.pri) } |