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/qmlplugindump/main.cpp | |
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/qmlplugindump/main.cpp')
-rw-r--r-- | tools/qmlplugindump/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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> |