Merge remote-tracking branch 'origin/2.6'

Conflicts:
	share/share.qbs

Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291

dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs

@@ -121,7 +121,7 @@ Component.prototype.createOperations = function()
                                 "@TargetDir@\\bin\\qtcreator.exe",
                                 "@StartMenuDir@/Qt Creator.lnk",
                                 "workingDirectory=@homeDir@" );
-        component.addElevatedOperation("Execute", "{0,3010}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q");
+        component.addElevatedOperation("Execute", "{0,3010,1638}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q");
         registerWindowsFileTypeExtensions();
     }
     if ( installer.value("os") == "x11" )

share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri

@@ -1,11 +1,6 @@
-QT += core gui network
+QT += core gui network declarative
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1 quick1-private core-private widgets-private gui-private script-private
-} else {
-    QT += declarative
-}
 
+greaterThan(QT_MAJOR_VERSION, 4): QT += declarative-private core-private widgets-private gui-private script-private
 
 greaterThan(QT_MAJOR_VERSION, 4) {
 } else {

share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri

@@ -4,11 +4,7 @@
 # It is recommended not to modify this file, since newer versions of Qt Creator
 # may offer an updated version of it.
 
-equals(QT_MAJOR_VERSION, 5) {
+QT += declarative
-    QT += quick1
-} else {
-    QT += declarative
-}
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h

src/libs/qmleditorwidgets/easingpane/easingpane.pri

@@ -6,10 +6,7 @@ SOURCES += $$PWD/easinggraph.cpp \
 HEADERS += $$PWD/easinggraph.h \
     $$PWD/easingcontextpane.h
 
-greaterThan(QT_MAJOR_VERSION, 4) {
+QT += declarative
-    QT += quick1
+
-} else {
-    QT += declarative
-}
 RESOURCES += $$PWD/easingpane.qrc
 FORMS += $$PWD/easingcontextpane.ui

src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri

@@ -1,9 +1,4 @@
-QT += script
+QT += script declarative
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
 
 INCLUDEPATH += $$PWD
 

src/libs/qmleditorwidgets/qmleditorwidgets.pri

@@ -1,10 +1,6 @@
 INCLUDEPATH *= $$PWD
 INCLUDEPATH *= $$PWD/easingpane
-greaterThan(QT_MAJOR_VERSION, 4) {
+QT += declarative
-    QT += quick1
-} else {
-    QT += declarative
-}
 
 LIBS *= -l$$qtLibraryName(QmlEditorWidgets)
 

src/libs/qmleditorwidgets/qmleditorwidgets.qbs

@@ -13,7 +13,7 @@ QtcLibrary {
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }
-    Depends { name: "Qt"; submodules: ["widgets", "quick1", "script"] }
+    Depends { name: "Qt"; submodules: ["widgets", "declarative", "script"] }
     Depends { name: "QmlJS" }
     Depends { name: "Utils" }
 

src/libs/qtcomponents/styleitem/styleitem.pro

@@ -1,11 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += script
+QT += script declarative
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += widgets quick1
-} else {
-    QT += declarative
-}
 
 TARGET  = styleplugin
 include(../../../../qtcreator.pri)

src/libs/qtcomponents/styleitem/styleitem.qbs

@@ -6,7 +6,7 @@ DynamicLibrary {
     destination: "lib/qtcreator/qtcomponents/plugin"
 
     Depends { name: "cpp" }
-    Depends { name: "Qt"; submodules: ["core", "widgets", "quick1", "script"] }
+    Depends { name: "Qt"; submodules: ["core", "widgets", "declarative", "script"] }
 
     cpp.defines: Defaults.defines(qbs)
 

src/plugins/plugins.pro

@@ -60,7 +60,7 @@ linux-* {
 
 include(../../qtcreator.pri)
 
-contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) {
+contains(QT_CONFIG, declarative) {
     SUBDIRS += \
             plugin_qmlprojectmanager \
             plugin_qmlprofiler
@@ -78,7 +78,7 @@ contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) {
         }
     }
 } else {
-    warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative (Qt 4.x) or QtQuick1 (Qt 5.x)");
+    warning("QmlProjectManager, QmlProfiler and QmlDesigner plugins have been disabled: The plugins require QtDeclarative");
 }
 
 include (debugger/lldb/guest/qtcreator-lldb.pri)

src/plugins/projectexplorer/projectexplorer.pro

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

src/plugins/projectexplorer/projectexplorer.qbs

@@ -6,7 +6,7 @@ import "../../../qbs/defaults.js" as Defaults
 QtcPlugin {
     name: "ProjectExplorer"
 
-    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "quick1"] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "declarative"] }
     Depends { name: "Core" }
     Depends { name: "Locator" }
     Depends { name: "Find" }

src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri

@@ -15,5 +15,5 @@ OTHER_FILES += \
     qml/ItemsView.qml
 
 greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1-private core-private script-private
+    QT += declarative-private core-private script-private
 }

src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri

@@ -39,11 +39,7 @@ HEADERS += propertyeditor.h \
     declarativewidgetview.h \
     gradientlineqmladaptor.h
     
-greaterThan(QT_MAJOR_VERSION, 4) {
+QT += declarative
-    QT += quick1
-} else {
-    QT += declarative
-}
 
 RESOURCES += propertyeditor.qrc
 FORMS += behaviordialog.ui

src/plugins/qmldesigner/qmldesigner.qbs

@@ -7,7 +7,7 @@ QtcPlugin {
 
     condition: qtcore.versionMajor == 4
     Depends { id: qtcore; name: "Qt.core" }
-    Depends { name: "Qt"; submodules: ["widgets", "quick1"] }
+    Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
     Depends { name: "Core" }
     Depends { name: "QmlJS" }
     Depends { name: "QmlEditorWidgets" }

src/plugins/qmlprofiler/qmlprofiler.pro

@@ -3,12 +3,7 @@ TARGET = QmlProfiler
 
 DEFINES += QMLPROFILER_LIBRARY
 
-QT += network script
+QT += network script declarative
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
 
 include(../../qtcreatorplugin.pri)
 include(../../plugins/coreplugin/coreplugin.pri)

src/plugins/qmlprofiler/qmlprofiler.qbs

@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "QmlProfiler"
 
-    Depends { name: "Qt"; submodules: ["widgets", "network", "script", "quick1"] }
+    Depends { name: "Qt"; submodules: ["widgets", "network", "script", "declarative"] }
     Depends { name: "Core" }
     Depends { name: "AnalyzerBase" }
     Depends { name: "QmlProjectManager" }

src/plugins/qmlprojectmanager/qmlprojectmanager.pro

@@ -1,12 +1,7 @@
 TEMPLATE = lib
 TARGET = QmlProjectManager
 
-QT += network
+QT += network declarative
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
 
 include(../../qtcreatorplugin.pri)
 include(qmlprojectmanager_dependencies.pri)

src/plugins/qmlprojectmanager/qmlprojectmanager.qbs

@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "QmlProjectManager"
 
-    Depends { name: "Qt"; submodules: ["widgets", "quick1"] }
+    Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }

src/plugins/qtsupport/qtsupport.pro

@@ -1,12 +1,7 @@
 TEMPLATE = lib
 TARGET = QtSupport
 DEFINES += QT_CREATOR QTSUPPORT_LIBRARY
-QT += network
+QT += network declarative
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
 
 include(../../qtcreatorplugin.pri)
 include(qtsupport_dependencies.pri)

src/plugins/qtsupport/qtsupport.qbs

@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "QtSupport"
 
-    Depends { name: "Qt"; submodules: ["widgets", "quick1"] }
+    Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }

src/plugins/welcome/welcome.pro

@@ -1,11 +1,6 @@
 TEMPLATE = lib
 TARGET = Welcome
-QT += network
+QT += network declarative
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
 
 include(../../qtcreatorplugin.pri)
 include(welcome_dependencies.pri)

src/plugins/welcome/welcome.qbs

@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "Welcome"
 
-    Depends { name: "Qt"; submodules: ["widgets", "network", "quick1"] }
+    Depends { name: "Qt"; submodules: ["widgets", "network", "declarative"] }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
 

src/tools/qmlpuppet/qmlpuppet.pro

@@ -4,7 +4,7 @@ include(../../../qtcreator.pri)
 include(../../private_headers.pri)
 
 greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += qtquick1-private core-private
+    QT += declarative-private core-private
     SUBDIRS += qmlpuppet
 } else {
     exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {