Commit 2f3730ca authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming.



QtQuick1 is now (again) called QtDeclarative.

Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: default avatarJ-P Nurmi <jpnurmi@digia.com>
parent d8e6a314
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) { greaterThan(QT_MAJOR_VERSION, 4) {
} else { } else {
......
...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
# It is recommended not to modify this file, since newer versions of Qt Creator # It is recommended not to modify this file, since newer versions of Qt Creator
# may offer an updated version of it. # may offer an updated version of it.
equals(QT_MAJOR_VERSION, 5) { QT += declarative
QT += quick1
} else {
QT += declarative
}
SOURCES += $$PWD/qmlapplicationviewer.cpp SOURCES += $$PWD/qmlapplicationviewer.cpp
HEADERS += $$PWD/qmlapplicationviewer.h HEADERS += $$PWD/qmlapplicationviewer.h
......
...@@ -934,9 +934,9 @@ Product { ...@@ -934,9 +934,9 @@ Product {
} }
Group { Group {
qbs.installDir: "share/qtcreator/templates/qtquickapp/qml/app/qtquick10" qbs.installDir: "share/qtcreator/templates/qtquickapp/qml/app/qtdeclarative0"
fileTags: ["install"] fileTags: ["install"]
prefix: "qtcreator/templates/qtquickapp/qml/app/qtquick10/" prefix: "qtcreator/templates/qtquickapp/qml/app/qtdeclarative0/"
files: [ files: [
"main.qml", "main.qml",
] ]
......
...@@ -6,10 +6,7 @@ SOURCES += $$PWD/easinggraph.cpp \ ...@@ -6,10 +6,7 @@ SOURCES += $$PWD/easinggraph.cpp \
HEADERS += $$PWD/easinggraph.h \ HEADERS += $$PWD/easinggraph.h \
$$PWD/easingcontextpane.h $$PWD/easingcontextpane.h
greaterThan(QT_MAJOR_VERSION, 4) { QT += declarative
QT += quick1
} else {
QT += declarative
}
RESOURCES += $$PWD/easingpane.qrc RESOURCES += $$PWD/easingpane.qrc
FORMS += $$PWD/easingcontextpane.ui FORMS += $$PWD/easingcontextpane.ui
QT += script QT += script declarative
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
......
INCLUDEPATH *= $$PWD INCLUDEPATH *= $$PWD
INCLUDEPATH *= $$PWD/easingpane INCLUDEPATH *= $$PWD/easingpane
greaterThan(QT_MAJOR_VERSION, 4) { QT += declarative
QT += quick1
} else {
QT += declarative
}
LIBS *= -l$$qtLibraryName(QmlEditorWidgets) LIBS *= -l$$qtLibraryName(QmlEditorWidgets)
......
...@@ -17,7 +17,7 @@ QtcLibrary { ...@@ -17,7 +17,7 @@ QtcLibrary {
cpp.optimization: "fast" cpp.optimization: "fast"
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["widgets", "quick1", "script"] } Depends { name: "Qt"; submodules: ["widgets", "declarative", "script"] }
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
files: [ files: [
......
TEMPLATE = lib TEMPLATE = lib
CONFIG += qt plugin CONFIG += qt plugin
QT += script QT += script declarative
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets quick1
} else {
QT += declarative
}
TARGET = styleplugin TARGET = styleplugin
include(../../../../qtcreator.pri) include(../../../../qtcreator.pri)
......
...@@ -5,7 +5,7 @@ DynamicLibrary { ...@@ -5,7 +5,7 @@ DynamicLibrary {
destination: "lib/qtcreator/qtcomponents/plugin" destination: "lib/qtcreator/qtcomponents/plugin"
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core", "widgets", "quick1", "script"] } Depends { name: "Qt"; submodules: ["core", "widgets", "declarative", "script"] }
cpp.defines: project.additionalCppDefines cpp.defines: project.additionalCppDefines
......
...@@ -60,7 +60,7 @@ linux-* { ...@@ -60,7 +60,7 @@ linux-* {
include(../../qtcreator.pri) include(../../qtcreator.pri)
contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) { contains(QT_CONFIG, declarative) {
SUBDIRS += \ SUBDIRS += \
plugin_qmlprojectmanager \ plugin_qmlprojectmanager \
plugin_qmlprofiler plugin_qmlprofiler
...@@ -78,7 +78,7 @@ contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) { ...@@ -78,7 +78,7 @@ contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) {
} }
} }
} else { } 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) include (debugger/lldb/guest/qtcreator-lldb.pri)
......
TEMPLATE = lib TEMPLATE = lib
TARGET = ProjectExplorer 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(../../qtcreatorplugin.pri)
include(projectexplorer_dependencies.pri) include(projectexplorer_dependencies.pri)
......
...@@ -4,7 +4,7 @@ import "../QtcPlugin.qbs" as QtcPlugin ...@@ -4,7 +4,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "ProjectExplorer" 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: "Core" }
Depends { name: "Locator" } Depends { name: "Locator" }
Depends { name: "Find" } Depends { name: "Find" }
......
...@@ -15,5 +15,5 @@ OTHER_FILES += \ ...@@ -15,5 +15,5 @@ OTHER_FILES += \
qml/ItemsView.qml qml/ItemsView.qml
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1-private core-private script-private QT += declarative-private core-private script-private
} }
...@@ -39,11 +39,7 @@ HEADERS += propertyeditor.h \ ...@@ -39,11 +39,7 @@ HEADERS += propertyeditor.h \
declarativewidgetview.h \ declarativewidgetview.h \
gradientlineqmladaptor.h gradientlineqmladaptor.h
greaterThan(QT_MAJOR_VERSION, 4) { QT += declarative
QT += quick1
} else {
QT += declarative
}
RESOURCES += propertyeditor.qrc RESOURCES += propertyeditor.qrc
FORMS += behaviordialog.ui FORMS += behaviordialog.ui
...@@ -7,7 +7,7 @@ QtcPlugin { ...@@ -7,7 +7,7 @@ QtcPlugin {
condition: qtcore.versionMajor == 4 condition: qtcore.versionMajor == 4
Depends { id: qtcore; name: "Qt.core" } Depends { id: qtcore; name: "Qt.core" }
Depends { name: "Qt"; submodules: ["widgets", "quick1"] } Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
Depends { name: "QmlEditorWidgets" } Depends { name: "QmlEditorWidgets" }
......
...@@ -3,12 +3,7 @@ TARGET = QmlProfiler ...@@ -3,12 +3,7 @@ TARGET = QmlProfiler
DEFINES += QMLPROFILER_LIBRARY DEFINES += QMLPROFILER_LIBRARY
QT += network script QT += network script declarative
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/coreplugin/coreplugin.pri)
......
...@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin ...@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "QmlProfiler" name: "QmlProfiler"
Depends { name: "Qt"; submodules: ["widgets", "network", "script", "quick1"] } Depends { name: "Qt"; submodules: ["widgets", "network", "script", "declarative"] }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "AnalyzerBase" } Depends { name: "AnalyzerBase" }
Depends { name: "QmlProjectManager" } Depends { name: "QmlProjectManager" }
......
TEMPLATE = lib TEMPLATE = lib
TARGET = QmlProjectManager TARGET = QmlProjectManager
QT += network QT += network declarative
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(qmlprojectmanager_dependencies.pri) include(qmlprojectmanager_dependencies.pri)
......
...@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin ...@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin { QtcPlugin {
name: "QmlProjectManager" name: "QmlProjectManager"
Depends { name: "Qt"; submodules: ["widgets", "quick1"] } Depends { name: "Qt"; submodules: ["widgets", "declarative"] }
Depends { name: "Core" } Depends { name: "Core" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
......
TEMPLATE = lib TEMPLATE = lib
TARGET = QtSupport TARGET = QtSupport
DEFINES += QT_CREATOR QTSUPPORT_LIBRARY DEFINES += QT_CREATOR QTSUPPORT_LIBRARY
QT += network QT += network declarative
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(qtsupport_dependencies.pri) include(qtsupport_dependencies.pri)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment