diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-08 14:44:30 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-08 15:47:00 +0100 |
| commit | 1d1d2f0b748e33caaa78d9b14fb34847cd0323f7 (patch) | |
| tree | e6fe1a32e2801b937125a8fc673d06196484823a /src/libs/utils/utils.pro | |
| parent | cb1cddb885addaeb4cf59a940ee64897bd4f17cf (diff) | |
| download | qt-creator-1d1d2f0b748e33caaa78d9b14fb34847cd0323f7.tar.gz | |
Compile with Qt 5.
- QtQuick1 renaming.
- Start on qtconcurrent split (pending renaming of Qt Creator's
qtconcurrent library).
- QWinEventNotifier is a public class in Qt 5.
- Metatype system: Classes need to be known.
Change-Id: I5582e7cc2777bf791a08b049262217055769c80f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/libs/utils/utils.pro')
| -rw-r--r-- | src/libs/utils/utils.pro | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index 5762de3631..2d8ef2be45 100644 --- a/src/libs/utils/utils.pro +++ b/src/libs/utils/utils.pro @@ -7,13 +7,12 @@ include(../../qtcreatorlibrary.pri) include(utils_dependencies.pri) include(utils-lib.pri) -# Needed for QtCore/private/qwineventnotifier_p.h -win32 { - greaterThan(QT_MAJOR_VERSION, 4) { - QT += core-private - } else { - include(../../private_headers.pri) - } + +greaterThan(QT_MAJOR_VERSION, 4) { + QT += concurrent +} else { +# Needed for QtCore/private/qwineventnotifier_p.h + win32:include(../../private_headers.pri) } HEADERS += \ |