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 /tests/auto/declarative/qdeclarativelanguage | |
| 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 'tests/auto/declarative/qdeclarativelanguage')
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro index fc1dd2a3..11a31e9f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro +++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelanguage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script-private core-private QT += script network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h index a4a12988..606297b1 100644 --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h @@ -47,12 +47,12 @@ #include <QtGui/qmatrix.h> #include <QtGui/qcolor.h> #include <QtGui/qvector3d.h> -#include <QtQuick1/qdeclarative.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeparserstatus.h> -#include <QtQuick1/qdeclarativepropertyvaluesource.h> -#include <QtQuick1/qdeclarativescriptstring.h> -#include <QtQuick1/qdeclarativeproperty.h> +#include <QtDeclarative/qdeclarative.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeparserstatus.h> +#include <QtDeclarative/qdeclarativepropertyvaluesource.h> +#include <QtDeclarative/qdeclarativescriptstring.h> +#include <QtDeclarative/qdeclarativeproperty.h> #include <private/qdeclarativecustomparser_p.h> diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index fa1f0bf0..eff8b8ad 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <qtest.h> #include <qdeclarativedatatest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <QtCore/qfile.h> #include <QtCore/qdebug.h> #include <QtCore/qfileinfo.h> |