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 /qtcreator.pri | |
| 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 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 23777db090..bc26570959 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -156,6 +156,7 @@ win32-msvc* { } qt:greaterThan(QT_MAJOR_VERSION, 4) { + contains(QT, core): QT += concurrent contains(QT, gui): QT += widgets contains(QT, declarative): QT += quick1 } |