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 /src/plugins/platforms/uikit/examples | |
| 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 'src/plugins/platforms/uikit/examples')
| -rw-r--r-- | src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp index 0d6bfee3..df6a1be4 100644 --- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -54,9 +54,9 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QFileInfo> -#include <QtQuick1/QDeclarativeComponent> -#include <QtQuick1/QDeclarativeEngine> -#include <QtQuick1/QDeclarativeContext> +#include <QtDeclarative/QDeclarativeComponent> +#include <QtDeclarative/QDeclarativeEngine> +#include <QtDeclarative/QDeclarativeContext> #if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800 diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h index 9d767440..9c1d84a4 100644 --- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h +++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h @@ -52,7 +52,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#include <QtQuick1/QDeclarativeView> +#include <QtDeclarative/QDeclarativeView> class QmlApplicationViewer : public QDeclarativeView { |