From b855240b782395f94315f43ea3e7e182299fac48 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Thu, 16 Feb 2012 14:43:03 +1000 Subject: Rename QDeclarative symbols to QQuick and QQml Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones --- modules/qt_declarative.pri | 17 ----------------- modules/qt_qml.pri | 17 +++++++++++++++++ modules/qt_qmltest.pri | 2 +- modules/qt_quick.pri | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 modules/qt_declarative.pri create mode 100644 modules/qt_qml.pri (limited to 'modules') diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri deleted file mode 100644 index 54727d462a..0000000000 --- a/modules/qt_declarative.pri +++ /dev/null @@ -1,17 +0,0 @@ -QT.declarative.VERSION = 5.0.0 -QT.declarative.MAJOR_VERSION = 5 -QT.declarative.MINOR_VERSION = 0 -QT.declarative.PATCH_VERSION = 0 - -QT.declarative.name = QtDeclarative -QT.declarative.bins = $$QT_MODULE_BIN_BASE -QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative -QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/$$QT.declarative.VERSION -QT.declarative.sources = $$QT_MODULE_BASE/src/declarative -QT.declarative.libs = $$QT_MODULE_LIB_BASE -QT.declarative.plugins = $$QT_MODULE_PLUGIN_BASE -QT.declarative.imports = $$QT_MODULE_IMPORT_BASE -QT.declarative.depends = gui network xmlpatterns -QT.declarative.DEFINES = QT_DECLARATIVE_LIB - -QT_CONFIG += declarative diff --git a/modules/qt_qml.pri b/modules/qt_qml.pri new file mode 100644 index 0000000000..82e70e3e93 --- /dev/null +++ b/modules/qt_qml.pri @@ -0,0 +1,17 @@ +QT.qml.VERSION = 5.0.0 +QT.qml.MAJOR_VERSION = 5 +QT.qml.MINOR_VERSION = 0 +QT.qml.PATCH_VERSION = 0 + +QT.qml.name = QtQml +QT.qml.bins = $$QT_MODULE_BIN_BASE +QT.qml.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQml +QT.qml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQml/$$QT.qml.VERSION +QT.qml.sources = $$QT_MODULE_BASE/src/qml +QT.qml.libs = $$QT_MODULE_LIB_BASE +QT.qml.plugins = $$QT_MODULE_PLUGIN_BASE +QT.qml.imports = $$QT_MODULE_IMPORT_BASE +QT.qml.depends = gui network xmlpatterns +QT.qml.DEFINES = QT_QML_LIB + +QT_CONFIG += qml diff --git a/modules/qt_qmltest.pri b/modules/qt_qmltest.pri index d00f621237..e3d747f700 100644 --- a/modules/qt_qmltest.pri +++ b/modules/qt_qmltest.pri @@ -11,7 +11,7 @@ QT.qmltest.sources = $$QT_MODULE_BASE/src/qmltest QT.qmltest.libs = $$QT_MODULE_LIB_BASE QT.qmltest.plugins = $$QT_MODULE_PLUGIN_BASE QT.qmltest.imports = $$QT_MODULE_IMPORT_BASE -QT.qmltest.depends = declarative testlib +QT.qmltest.depends = qml testlib QT.qmltest.DEFINES = QT_QMLTEST_LIB QT_CONFIG += qmltest diff --git a/modules/qt_quick.pri b/modules/qt_quick.pri index 0dc827b732..dc71b31194 100644 --- a/modules/qt_quick.pri +++ b/modules/qt_quick.pri @@ -11,7 +11,7 @@ QT.quick.sources = $$QT_MODULE_BASE/src/quick QT.quick.libs = $$QT_MODULE_LIB_BASE QT.quick.plugins = $$QT_MODULE_PLUGIN_BASE QT.quick.imports = $$QT_MODULE_IMPORT_BASE -QT.quick.depends = declarative +QT.quick.depends = qml QT.quick.DEFINES = QT_QUICK_LIB QT_CONFIG += quick -- cgit v1.2.3