Merge remote-tracking branch 'origin/2.6'

Conflicts: share/share.qbs Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291
2012-10-18 13:39:47 +02:00
parent ce911e04c5 c89ffbe3ce
commit 9bbafdb506
24 changed files with 27 additions and 82 deletions
--- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs
+++ b/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" )
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
@@ -1,11 +1,6 @@
-QT += core gui network
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1 quick1-private core-private widgets-private gui-private script-private
-} else {
-    QT += declarative
-}
+QT += core gui network declarative

+greaterThan(QT_MAJOR_VERSION, 4): QT += declarative-private core-private widgets-private gui-private script-private

 greaterThan(QT_MAJOR_VERSION, 4) {
 } else {
--- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/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 += quick1
-} else {
-    QT += declarative
-}
+QT += declarative

 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
--- a/src/libs/qmleditorwidgets/easingpane/easingpane.pri
+++ b/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 += quick1
-} else {
-    QT += declarative
-}
+QT += declarative
+
 RESOURCES += $$PWD/easingpane.qrc
 FORMS += $$PWD/easingcontextpane.ui
--- a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
@@ -1,9 +1,4 @@
-QT += script
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += script declarative

 INCLUDEPATH += $$PWD

--- a/src/libs/qmleditorwidgets/qmleditorwidgets.pri
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pri
@@ -1,10 +1,6 @@
 INCLUDEPATH *= $$PWD
 INCLUDEPATH *= $$PWD/easingpane
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative

 LIBS *= -l$$qtLibraryName(QmlEditorWidgets)

--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/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" }

--- a/src/libs/qtcomponents/styleitem/styleitem.pro
+++ b/src/libs/qtcomponents/styleitem/styleitem.pro
@@ -1,11 +1,6 @@
 TEMPLATE = lib
 CONFIG += qt plugin
-QT += script
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += widgets quick1
-} else {
-    QT += declarative
-}
+QT += script declarative

 TARGET  = styleplugin
 include(../../../../qtcreator.pri)
--- a/src/libs/qtcomponents/styleitem/styleitem.qbs
+++ b/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)

--- a/src/plugins/plugins.pro
+++ b/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)
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -1,11 +1,6 @@
 TEMPLATE = lib
 TARGET = ProjectExplorer
-QT += xml script network
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += xml script network declarative

 include(../../qtcreatorplugin.pri)
 include(projectexplorer_dependencies.pri)
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/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" }
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri
+++ b/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
 }
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri
@@ -39,11 +39,7 @@ HEADERS += propertyeditor.h \
    declarativewidgetview.h \
    gradientlineqmladaptor.h
    
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += declarative

 RESOURCES += propertyeditor.qrc
 FORMS += behaviordialog.ui
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/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" }
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofiler/qmlprofiler.pro
@@ -3,12 +3,7 @@ TARGET = QmlProfiler

 DEFINES += QMLPROFILER_LIBRARY

-QT += network script
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += network script declarative

 include(../../qtcreatorplugin.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/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" }
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
@@ -1,12 +1,7 @@
 TEMPLATE = lib
 TARGET = QmlProjectManager

-QT += network
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += network declarative

 include(../../qtcreatorplugin.pri)
 include(qmlprojectmanager_dependencies.pri)
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/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" }
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -1,12 +1,7 @@
 TEMPLATE = lib
 TARGET = QtSupport
 DEFINES += QT_CREATOR QTSUPPORT_LIBRARY
-QT += network
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += network declarative

 include(../../qtcreatorplugin.pri)
 include(qtsupport_dependencies.pri)
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/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" }
--- a/src/plugins/welcome/welcome.pro
+++ b/src/plugins/welcome/welcome.pro
@@ -1,11 +1,6 @@
 TEMPLATE = lib
 TARGET = Welcome
-QT += network
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += quick1
-} else {
-    QT += declarative
-}
+QT += network declarative

 include(../../qtcreatorplugin.pri)
 include(welcome_dependencies.pri)
--- a/src/plugins/welcome/welcome.qbs
+++ b/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" }

--- a/src/tools/qmlpuppet/qmlpuppet.pro
+++ b/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) {