feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move QtConcurrent library into Utils.

Browse Source 
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>
This commit is contained in:
Friedemann Kleint
2012-02-09 09:35:03 +01:00
committed by Eike Ziller
parent def4b89e7d
commit 622cac50f4
36 changed files with 32 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/utils.pro
View File

@@ -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)
}