diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-13 17:12:53 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-03-13 17:20:50 +0100 |
| commit | 489feeae159f0ea9ab591fc80b52aad55d6b0b3e (patch) | |
| tree | d0dba2024438faab2fec1149bb2c55d19572e204 /src/plugins/qmlprojectmanager | |
| parent | 1ca4cad6135f7358898100ce19b37e2e10c1b49d (diff) | |
| download | qt-creator-489feeae159f0ea9ab591fc80b52aad55d6b0b3e.tar.gz | |
Compile with Qt 5.
Add either QtDeclarative (Qt 4) or QtQuick1 (Qt 5) to QT.
Mixing them leads to problems with include paths and linking.
Change-Id: I188240641216ee227931a7be2105bc4838385c79
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectmanager.pro | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro index 4885be0441..cd40ae3e2f 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro @@ -1,7 +1,12 @@ TEMPLATE = lib TARGET = QmlProjectManager -QT += declarative network +QT += network +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} include(../../qtcreatorplugin.pri) include(qmlprojectmanager_dependencies.pri) |