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

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

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)
 

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
+plugin_todo.depends += plugin_cpptools

src/plugins/projectexplorer/projectexplorer.pro

@@ -1,8 +1,11 @@
 TEMPLATE = lib
 TARGET = ProjectExplorer
-QT += xml \
+QT += xml script
-    script \
+greaterThan(QT_MAJOR_VERSION, 4) {
-    declarative
+    QT += quick1
+} else {
+    QT += declarative
+}
 
 include(../../qtcreatorplugin.pri)
 include(projectexplorer_dependencies.pri)

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
 

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)

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)

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 += \

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)