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/imports/particles | |
| parent | 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff) | |
| download | qtquick1-79fed8757e26f946745eec9d8bba8b91aeb1a742.tar.gz | |
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/imports/particles')
| -rw-r--r-- | src/imports/particles/particles.cpp | 4 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 6 | ||||
| -rw-r--r-- | src/imports/particles/qdeclarativeparticles_p.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/particles/particles.cpp b/src/imports/particles/particles.cpp index 0f5ee3a6..15f1ca4f 100644 --- a/src/imports/particles/particles.cpp +++ b/src/imports/particles/particles.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include "qdeclarativeparticles_p.h" diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index b4ce049d..029d6595 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -1,8 +1,8 @@ TARGET = qmlparticlesplugin -TARGETPATH = QtQuick1/Qt/labs/particles +TARGETPATH = QtDeclarative/Qt/labs/particles include(../qimportbase.pri) -QT += quick1 quick1-private core-private gui-private widgets-private +QT += declarative declarative-private core-private gui-private widgets-private SOURCES += \ qdeclarativeparticles.cpp \ @@ -13,7 +13,7 @@ HEADERS += \ OTHER_FILES += particles.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/particles/qdeclarativeparticles_p.h b/src/imports/particles/qdeclarativeparticles_p.h index 69f646c2..fc58ad92 100644 --- a/src/imports/particles/qdeclarativeparticles_p.h +++ b/src/imports/particles/qdeclarativeparticles_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPARTICLES_H #define QDECLARATIVEPARTICLES_H -#include <QtQuick1/qdeclarativeitem.h> +#include <QtDeclarative/qdeclarativeitem.h> QT_BEGIN_HEADER |