From 2f3730ca4762b885605584c7eaba6102cb69e068 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 18 Oct 2012 09:41:05 +0200 Subject: [PATCH] Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming. QtQuick1 is now (again) called QtDeclarative. Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47 Reviewed-by: Joerg Bornemann Reviewed-by: J-P Nurmi --- share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri | 9 ++------- .../qmlapplicationviewer/qmlapplicationviewer.pri | 6 +----- share/share.qbs | 4 ++-- src/libs/qmleditorwidgets/easingpane/easingpane.pri | 7 ++----- src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri | 7 +------ src/libs/qmleditorwidgets/qmleditorwidgets.pri | 6 +----- src/libs/qmleditorwidgets/qmleditorwidgets.qbs | 2 +- src/libs/qtcomponents/styleitem/styleitem.pro | 7 +------ src/libs/qtcomponents/styleitem/styleitem.qbs | 2 +- src/plugins/plugins.pro | 4 ++-- src/plugins/projectexplorer/projectexplorer.pro | 7 +------ src/plugins/projectexplorer/projectexplorer.qbs | 2 +- .../qmldesigner/components/itemlibrary/itemlibrary.pri | 2 +- .../components/propertyeditor/propertyeditor.pri | 6 +----- src/plugins/qmldesigner/qmldesigner.qbs | 2 +- src/plugins/qmlprofiler/qmlprofiler.pro | 7 +------ src/plugins/qmlprofiler/qmlprofiler.qbs | 2 +- src/plugins/qmlprojectmanager/qmlprojectmanager.pro | 7 +------ src/plugins/qmlprojectmanager/qmlprojectmanager.qbs | 2 +- src/plugins/qtsupport/qtsupport.pro | 7 +------ src/plugins/qtsupport/qtsupport.qbs | 2 +- src/plugins/welcome/welcome.pro | 7 +------ src/plugins/welcome/welcome.qbs | 2 +- src/tools/qmlpuppet/qmlpuppet.pro | 2 +- 24 files changed, 28 insertions(+), 83 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri index 168a2688365..8f76d142ce7 100644 --- 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 { diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri index 0fd61405edd..a32c88d1ae9 100644 --- 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 diff --git a/share/share.qbs b/share/share.qbs index 9a69a21bbf8..b8332ebf3f1 100644 --- a/share/share.qbs +++ b/share/share.qbs @@ -934,9 +934,9 @@ Product { } Group { - qbs.installDir: "share/qtcreator/templates/qtquickapp/qml/app/qtquick10" + qbs.installDir: "share/qtcreator/templates/qtquickapp/qml/app/qtdeclarative0" fileTags: ["install"] - prefix: "qtcreator/templates/qtquickapp/qml/app/qtquick10/" + prefix: "qtcreator/templates/qtquickapp/qml/app/qtdeclarative0/" files: [ "main.qml", ] diff --git a/src/libs/qmleditorwidgets/easingpane/easingpane.pri b/src/libs/qmleditorwidgets/easingpane/easingpane.pri index 1002ad27947..fc6b057d811 100644 --- 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 diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri index f3b0cea8012..da748cf52da 100644 --- 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 diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pri b/src/libs/qmleditorwidgets/qmleditorwidgets.pri index fcd2f9b3dbb..89663f6fc82 100644 --- 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) diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs index 7310ed8d037..551056f6f5f 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs +++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs @@ -17,7 +17,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" } files: [ diff --git a/src/libs/qtcomponents/styleitem/styleitem.pro b/src/libs/qtcomponents/styleitem/styleitem.pro index d94e7dfa456..67666b0ccf8 100644 --- 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) diff --git a/src/libs/qtcomponents/styleitem/styleitem.qbs b/src/libs/qtcomponents/styleitem/styleitem.qbs index e4e8d45e365..b5444dcd3aa 100644 --- a/src/libs/qtcomponents/styleitem/styleitem.qbs +++ b/src/libs/qtcomponents/styleitem/styleitem.qbs @@ -5,7 +5,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: project.additionalCppDefines diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 3e9b100c6d8..7e6268b708e 100644 --- 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) diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 89933f3d3c3..a4bd7003df3 100644 --- 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) diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 9e368cbc936..6c8b79753fb 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -4,7 +4,7 @@ import "../QtcPlugin.qbs" as QtcPlugin 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" } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri index a28176c5244..853468ac330 100644 --- 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 } diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri index 57b14c18975..150bba0e120 100644 --- 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 diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs index 419a6e114b1..2db903d19d3 100644 --- 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" } diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro index e4c848e312f..ca75dc68c00 100644 --- 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) diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs index 92fa17e5d4b..345a5354e00 100644 --- 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" } diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro index 5249f4687b0..ab1de261e84 100644 --- 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) diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs index 9ac468e42c3..5461694201f 100644 --- 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" } diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro index efaefe144c3..c1a2ad0be6c 100644 --- 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) diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index 06f689ec674..e8aed6c4977 100644 --- 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" } diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro index 57296515bf1..482506916b0 100644 --- 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) diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs index bb975867df0..d999ee58c58 100644 --- 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" } diff --git a/src/tools/qmlpuppet/qmlpuppet.pro b/src/tools/qmlpuppet/qmlpuppet.pro index 1041787b7a2..0fa1cd177fa 100644 --- 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) {