From 489feeae159f0ea9ab591fc80b52aad55d6b0b3e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 13 Mar 2012 17:12:53 +0100
Subject: [PATCH] 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>
---
qtcreator.pri | 1 -
src/libs/qmleditorwidgets/qmleditorwidgets.pri | 6 +++++-
src/plugins/plugins.pro | 4 ++--
src/plugins/projectexplorer/projectexplorer.pro | 9 ++++++---
src/plugins/qmljsinspector/qmljsinspector.pro | 7 ++++++-
src/plugins/qmlprofiler/qmlprofiler.pro | 7 ++++++-
src/plugins/qmlprojectmanager/qmlprojectmanager.pro | 7 ++++++-
src/plugins/qtsupport/qtsupport.pro | 8 +++++++-
src/plugins/welcome/welcome.pro | 7 ++++++-
9 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index fcf61a5cef2..79aa849a7ab 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -157,5 +157,4 @@ win32-msvc* {
qt:greaterThan(QT_MAJOR_VERSION, 4) {
contains(QT, core): QT += concurrent
contains(QT, gui): QT += widgets
- contains(QT, declarative): QT += quick1
}
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pri b/src/libs/qmleditorwidgets/qmleditorwidgets.pri
index 55a4c3da0ad..4a2788cf3a8 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.pri
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pri
@@ -1,5 +1,9 @@
INCLUDEPATH += $$PWD $$PWD/easingpane
-QT += declarative
+greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += quick1
+} else {
+ QT += declarative
+}
LIBS *= -l$$qtLibraryName(QmlEditorWidgets)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index e1058767cd9..a05b953f7ff 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -58,7 +58,7 @@ linux-* {
include(../../qtcreator.pri)
-contains(QT_CONFIG, declarative) {
+contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) {
SUBDIRS += \
plugin_qmlprojectmanager \
plugin_qmljsinspector
@@ -311,4 +311,4 @@ plugin_todo.subdir = todo
plugin_todo.depends = plugin_coreplugin
plugin_todo.depends += plugin_projectexplorer
plugin_todo.depends += plugin_texteditor
-plugin_todo.depends += plugin_cpptools
\ No newline at end of file
+plugin_todo.depends += plugin_cpptools
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 39581e7289d..1727a93388d 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -1,8 +1,11 @@
TEMPLATE = lib
TARGET = ProjectExplorer
-QT += xml \
- script \
- declarative
+QT += xml script
+greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += quick1
+} else {
+ QT += declarative
+}
include(../../qtcreatorplugin.pri)
include(projectexplorer_dependencies.pri)
diff --git a/src/plugins/qmljsinspector/qmljsinspector.pro b/src/plugins/qmljsinspector/qmljsinspector.pro
index 5d39cfa5e00..fe64d757eaa 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.pro
+++ b/src/plugins/qmljsinspector/qmljsinspector.pro
@@ -2,7 +2,12 @@ TEMPLATE = lib
TARGET = QmlJSInspector
INCLUDEPATH += .
DEPENDPATH += .
-QT += declarative network
+QT += network
+greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += quick1
+} else {
+ QT += declarative
+}
DEFINES += QMLJSINSPECTOR_LIBRARY
diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro
index 2f41d50db13..7403b1fb68a 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofiler/qmlprofiler.pro
@@ -3,7 +3,12 @@ TARGET = QmlProfiler
DEFINES += PROFILER_LIBRARY
-QT += network script declarative
+QT += network script
+greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += quick1
+} else {
+ QT += declarative
+}
include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
index 4885be0441e..cd40ae3e2f5 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)
diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro
index 088a61e7d0f..383c154a428 100644
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -1,7 +1,13 @@
TEMPLATE = lib
TARGET = QtSupport
DEFINES += QT_CREATOR QTSUPPORT_LIBRARY
-QT += network declarative
+QT += network
+greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += quick1
+} else {
+ QT += declarative
+}
+
include(../../qtcreatorplugin.pri)
include(qtsupport_dependencies.pri)
DEFINES += \
diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro
index 482506916b0..57296515bf1 100644
--- a/src/plugins/welcome/welcome.pro
+++ b/src/plugins/welcome/welcome.pro
@@ -1,6 +1,11 @@
TEMPLATE = lib
TARGET = Welcome
-QT += network declarative
+QT += network
+greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += quick1
+} else {
+ QT += declarative
+}
include(../../qtcreatorplugin.pri)
include(welcome_dependencies.pri)
--
GitLab