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

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
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 {
......
......@@ -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
......
......@@ -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",
]
......
......@@ -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
QT += script
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += script declarative
INCLUDEPATH += $$PWD
......
INCLUDEPATH *= $$PWD
INCLUDEPATH *= $$PWD/easingpane
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += declarative
LIBS *= -l$$qtLibraryName(QmlEditorWidgets)
......
......@@ -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: [
......
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)
......
......@@ -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
......
......@@ -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)
......
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)
......
......@@ -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" }
......
......@@ -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
}
......@@ -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
......@@ -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" }
......
......@@ -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)
......
......@@ -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" }
......
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)
......
......@@ -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" }
......
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)
......
......@@ -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" }
......
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)
......
......@@ -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" }
......
......@@ -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) {
......
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