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
......@@ -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