diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-15 15:58:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 17:18:22 +0200 |
commit | 79fed8757e26f946745eec9d8bba8b91aeb1a742 (patch) | |
tree | 2bf779aff001b7e9675f52ccb270a0041de06b62 /tools | |
parent | 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff) |
Rename the QtQuick1 module back to QtDeclarative
Matches the name that this code used to have in Qt 4.
- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
it was in Qt 4 and matching the library name again. This also
changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.
Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro | 2 | ||||
-rw-r--r-- | tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp | 2 | ||||
-rw-r--r-- | tools/qml/qml.pri | 2 | ||||
-rw-r--r-- | tools/qml/qml.pro | 4 | ||||
-rw-r--r-- | tools/qmlplugindump/main.cpp | 10 | ||||
-rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro index cbe3ebe2..b8abe874 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = qdeclarativeview CONFIG += qt warn_on plugin designer -QT += quick1 +QT += declarative include(../plugins.pri) build_all:!build_pass { diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp index 1a6a7bf0..32c574fb 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp @@ -45,7 +45,7 @@ #include <QtDesigner/QExtensionManager> #include <QtCore/qplugin.h> -#include <QtQuick1/QDeclarativeView> +#include <QtDeclarative/QDeclarativeView> static const char toolTipC[] = "QtDeclarative view widget"; diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 67cf0a4d..c5f38808 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -1,4 +1,4 @@ -QT += quick1 quick1-private script network sql core-private gui-private widgets-private +QT += declarative declarative-private script network sql core-private gui-private widgets-private contains(QT_CONFIG, opengl) { QT += opengl DEFINES += GL_SUPPORTED diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 4e5e53e2..797fc2cf 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += qt uic quick1_debug quick1 -DESTDIR = $$QT.quick1.bins +CONFIG += qt uic declarative_debug declarative +DESTDIR = $$QT.declarative.bins include(qml.pri) diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 53d7e0cb..9b9ca363 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/private/qdeclarativemetatype_p.h> -#include <QtQuick1/private/qdeclarativeopenmetaobject_p.h> -#include <QtQuick1/private/qdeclarativeevents_p_p.h> -#include <QtQuick1/private/qdeclarativepincharea_p.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/private/qdeclarativemetatype_p.h> +#include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h> +#include <QtDeclarative/private/qdeclarativeevents_p_p.h> +#include <QtDeclarative/private/qdeclarativepincharea_p.h> #include <QtGui/QGuiApplication> #include <QtCore/QDir> diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 53d202e7..642ea4c5 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -1,7 +1,7 @@ -DESTDIR = $$QT.quick1.bins +DESTDIR = $$QT.declarative.bins TARGET = qml1plugindump -QT += core-private quick1-private +QT += core-private declarative-private SOURCES += \ main.cpp \ |