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 | |
| 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')
150 files changed, 303 insertions, 303 deletions
diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt index 1a1352ff..95459d19 100644 --- a/tests/auto/cmake/test_modules/CMakeLists.txt +++ b/tests/auto/cmake/test_modules/CMakeLists.txt @@ -6,19 +6,19 @@ project(test_modules) find_package(Qt5Script REQUIRED) find_package(Qt5Widgets REQUIRED) -find_package(Qt5Quick1 REQUIRED) +find_package(Qt5Declarative REQUIRED) include_directories( - ${Qt5Quick1_INCLUDE_DIRS} + ${Qt5Declarative_INCLUDE_DIRS} ) add_definitions( - ${Qt5Quick1_DEFINITIONS} + ${Qt5Declarative_DEFINITIONS} ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") add_executable(mainapp main.cpp) target_link_libraries(mainapp - ${Qt5Quick1_LIBRARIES} + ${Qt5Declarative_LIBRARIES} ) diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index 57c1642d..111962a5 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -3,7 +3,7 @@ testcase.timeout = 400 # this test is slow TARGET = tst_examples QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_examples.cpp diff --git a/tests/auto/declarative/moduleqt47/moduleqt47.pro b/tests/auto/declarative/moduleqt47/moduleqt47.pro index c7e54046..93da5262 100644 --- a/tests/auto/declarative/moduleqt47/moduleqt47.pro +++ b/tests/auto/declarative/moduleqt47/moduleqt47.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_moduleqt47 QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui widgets +contains(QT_CONFIG,declarative): QT += declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_moduleqt47.cpp diff --git a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp index 74f4093b..1978aae3 100644 --- a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp +++ b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <qtest.h> #include <QDir> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> class tst_moduleqt47 : public QObject { diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro index cc43281e..e314f426 100644 --- a/tests/auto/declarative/parserstress/parserstress.pro +++ b/tests/auto/declarative/parserstress/parserstress.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_parserstress QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_parserstress.cpp diff --git a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro index ed77ae76..912676d0 100644 --- a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro +++ b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanchors QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets widgets-private gui gui-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui gui-private core-private SOURCES += tst_qdeclarativeanchors.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp index 79d46507..965fd0e7 100644 --- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp +++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp @@ -43,13 +43,13 @@ #include <QSignalSpy> #include <QtWidgets/QGraphicsWidget> #include <private/qgraphicsitem_p.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativetext_p.h> -#include <QtQuick1/private/qdeclarativeanchors_p_p.h> -#include <QtQuick1/private/qdeclarativeitem_p.h> +#include <QtDeclarative/private/qdeclarativeanchors_p_p.h> +#include <QtDeclarative/private/qdeclarativeitem_p.h> Q_DECLARE_METATYPE(QDeclarativeAnchors::Anchor) Q_DECLARE_METATYPE(QDeclarativeAnchorLine::AnchorLine) diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro index 22c388b4..c49b305b 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro +++ b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimatedimage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private network widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private network widgets HEADERS += ../shared/testhttpserver.h SOURCES += tst_qdeclarativeanimatedimage.cpp ../shared/testhttpserver.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp index de9accca..f2c93346 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp +++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp @@ -40,14 +40,14 @@ ****************************************************************************/ #include <qtest.h> #include <qdeclarativedatatest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativeimage_p.h> #include <private/qdeclarativeanimatedimage_p.h> #include <QSignalSpy> -#include <QtQuick1/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativecontext.h> #include "../shared/testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro index 37ba135c..77fc0707 100644 --- a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimations QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private gui-private widgets-private SOURCES += tst_qdeclarativeanimations.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 87063d1d..afd0b3d3 100644 --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativeanimation_p.h> #include <private/qdeclarativeitem_p.h> diff --git a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro index a9d3669a..cd896bb1 100644 --- a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeapplication QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui-private widgets +contains(QT_CONFIG,declarative): QT += declarative gui-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeapplication.cpp diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index af8e28dc..3904663a 100644 --- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativeitem.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeitem.h> #include <QtWidgets/qgraphicsview.h> #include <QtWidgets/qgraphicsscene.h> #include <QtWidgets/qapplication.h> diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro index 8c22e208..18b04f57 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativebehaviors QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private widgets-private gui-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private widgets-private gui-private SOURCES += tst_qdeclarativebehaviors.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp index 3fe2330f..e6eea8ae 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp +++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include <qtest.h> #include <qsignalspy.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativetext_p.h> #include <private/qdeclarativebehavior_p.h> diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro index 8e8a14e0..09446c74 100644 --- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativebinding QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativebinding.cpp diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp index 9770fbf3..7636909c 100644 --- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp +++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativebind_p.h> #include <private/qdeclarativerectangle_p.h> diff --git a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro index 8cbc8de1..0ed28acf 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeborderimage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets network +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp index 250c7846..fdad66f1 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp +++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp @@ -46,13 +46,13 @@ #include <QGraphicsScene> #include <QPainter> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativeborderimage_p.h> #include <private/qdeclarativeimagebase_p.h> #include <private/qdeclarativescalegrid_p_p.h> #include <private/qdeclarativeloader_p.h> -#include <QtQuick1/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativecontext.h> #include "../shared/testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index ad5d8dbf..5bd9e282 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativecomponent QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative QT += script network widgets macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp index 39a42dd1..573bdb44 100644 --- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp +++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp @@ -42,10 +42,10 @@ #include <QDebug> #include <QtWidgets/qgraphicsitem.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeitem.h> -#include <QtQuick1/qdeclarativeproperty.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeitem.h> +#include <QtDeclarative/qdeclarativeproperty.h> #include <qcolor.h> class tst_qdeclarativecomponent : public QObject diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro index 8b84993f..e71c6327 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeconnection QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui core-private script-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private gui-private widgets-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeconnection.cpp diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index 9f90af82..7729f9d1 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativeconnections_p.h> #include <private/qdeclarativeitem_p.h> -#include <QtQuick1/qdeclarativescriptstring.h> +#include <QtDeclarative/qdeclarativescriptstring.h> class tst_qdeclarativeconnection : public QObject diff --git a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro index ef0d2f3b..ef0ff142 100644 --- a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro +++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativecontext QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative SOURCES += tst_qdeclarativecontext.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro index e5fc671f..70b12e8b 100644 --- a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro +++ b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebug QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private script-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private script-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index 7c59dcea..0c108af9 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -45,11 +45,11 @@ #include <QDebug> #include <QThread> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeexpression.h> -#include <QtQuick1/qdeclarativeproperty.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeexpression.h> +#include <QtDeclarative/qdeclarativeproperty.h> #include <private/qdeclarativebinding_p.h> #include <private/qdeclarativeenginedebug_p.h> diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro index 0d887850..c99265b5 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro +++ b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugclient QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp index 9a0937bd..4d2aba4e 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp +++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp @@ -45,7 +45,7 @@ #include <QDebug> #include <QThread> -#include <QtQuick1/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeengine.h> #include <private/qdeclarativedebugclient_p.h> diff --git a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h index d1d4a75a..ae509fdd 100644 --- a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h +++ b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h @@ -53,7 +53,7 @@ class QDeclarativeEngine; // Helper methods to access private API through a stable interface // This is used in the qmljsdebugger library of QtCreator. -class Q_QUICK1_EXPORT QDeclarativeDebugHelper +class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper { public: static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine); diff --git a/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro index 867d9b52..1cde1be0 100644 --- a/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro +++ b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebughelper QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private script script-private core-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private script script-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativedebughelper.cpp diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro index 157328d9..82336dc0 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += quick1 quick1-private gui widgets +QT += declarative declarative-private gui widgets CONFIG += declarative_debug CONFIG += console diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp index d462b811..40d7bc13 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp +++ b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp @@ -44,7 +44,7 @@ #include <QDeclarativeComponent> #include <QDeclarativeEngine> #include <QStringList> -#include <QtQuick1/private/qdeclarativedebugservice_p.h> +#include <QtDeclarative/private/qdeclarativedebugservice_p.h> int main(int argc, char *argv[]) { diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp index 7325be4f..6c1197bc 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -41,10 +41,10 @@ #include <qtest.h> #include <qdeclarativedatatest.h> -#include <QtQuick1/QDeclarativeEngine> -#include <QtQuick1/private/qdeclarativedebugclient_p.h> -#include <QtQuick1/private/qdeclarativedebugservice_p.h> -#include <QtQuick1/private/qjsdebuggeragent_p.h> +#include <QtDeclarative/QDeclarativeEngine> +#include <QtDeclarative/private/qdeclarativedebugclient_p.h> +#include <QtDeclarative/private/qdeclarativedebugservice_p.h> +#include <QtDeclarative/private/qjsdebuggeragent_p.h> #include <QtCore/QFileInfo> #include <QtCore/QDir> #include <QtCore/QProcess> diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro index 6f8a8577..4f972747 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro @@ -3,7 +3,7 @@ testcase.timeout = 600 # this test is slow TARGET = tst_qdeclarativedebugjs QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private network script core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private network script core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro index b517c11d..e27b324e 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro +++ b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugservice QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 66aed242..f6982f87 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -45,7 +45,7 @@ #include <QDebug> #include <QThread> -#include <QtQuick1/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeengine.h> #include <private/qdeclarativedebugclient_p.h> #include <private/qdeclarativedebugservice_p.h> diff --git a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro index e3056c71..480ac463 100644 --- a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro +++ b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedom QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativedom.cpp diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp index 90d0ed8d..37fba35a 100644 --- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp +++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/private/qdeclarativedom_p.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/private/qdeclarativedom_p.h> #include <QtCore/QDebug> #include <QtCore/QFile> diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index 325f5bc8..92f8d09f 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeecmascript QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private network widgets core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private network widgets core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h index 8b88813e..f7afe0e8 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h @@ -42,19 +42,19 @@ #define TESTTYPES_H #include <QtCore/qobject.h> -#include <QtQuick1/qdeclarative.h> -#include <QtQuick1/qdeclarativeexpression.h> +#include <QtDeclarative/qdeclarative.h> +#include <QtDeclarative/qdeclarativeexpression.h> #include <QtCore/qpoint.h> #include <QtCore/qsize.h> -#include <QtQuick1/qdeclarativelist.h> +#include <QtDeclarative/qdeclarativelist.h> #include <QtCore/qrect.h> #include <QtGui/qmatrix.h> #include <QtGui/qcolor.h> #include <QtGui/qvector3d.h> #include <QtCore/qdatetime.h> #include <QtScript/qscriptvalue.h> -#include <QtQuick1/qdeclarativescriptstring.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativescriptstring.h> +#include <QtDeclarative/qdeclarativecomponent.h> class MyQmlAttachedObject : public QObject { diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 339db83c..4e6499a1 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -40,13 +40,13 @@ ****************************************************************************/ #include <qtest.h> #include <qdeclarativedatatest.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativeexpression.h> -#include <QtQuick1/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeexpression.h> +#include <QtDeclarative/qdeclarativecontext.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdebug.h> -#include <QtQuick1/private/qdeclarativeguard_p.h> +#include <QtDeclarative/private/qdeclarativeguard_p.h> #include <QtCore/qdir.h> #include <QtCore/qnumeric.h> #include <private/qdeclarativeengine_p.h> diff --git a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro index d7424a24..8004009f 100644 --- a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro +++ b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeengine QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 network +contains(QT_CONFIG,declarative): QT += declarative network macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeengine.cpp diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro index bb129e37..df5efe09 100644 --- a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro +++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeerror QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative SOURCES += tst_qdeclarativeerror.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro index 98fa93df..bc613081 100644 --- a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro +++ b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeflickable QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets script-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets script-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeflickable.cpp diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp index 98e55c69..a0ba6697 100644 --- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp +++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativeflickable_p.h> #include <private/qdeclarativevaluetype_p.h> #include <QtWidgets/qgraphicswidget.h> diff --git a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro index ed19953b..c9770933 100644 --- a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro +++ b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeflipable QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeflipable.cpp diff --git a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp index 831b7929..091cb362 100644 --- a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp +++ b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativeflipable_p.h> #include <private/qdeclarativevaluetype_p.h> #include <QFontMetrics> diff --git a/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro b/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro index 471fd85b..42ea0b8a 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro +++ b/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefocusscope QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets SOURCES += tst_qdeclarativefocusscope.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp index a6103d72..8ff45f82 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp +++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp @@ -41,13 +41,13 @@ #include <qtest.h> #include <QSignalSpy> #include <QGuiApplication> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativetextedit_p.h> #include <private/qdeclarativetext_p.h> -#include <QtQuick1/private/qdeclarativefocusscope_p.h> +#include <QtDeclarative/private/qdeclarativefocusscope_p.h> class tst_qdeclarativefocusscope : public QObject { diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro index 7ff1f0dd..fc876d13 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefolderlistmodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativefolderlistmodel.cpp diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp index 2522c6dc..990bf419 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <QtCore/qdir.h> #include <QtCore/qfile.h> #include <QtCore/qabstractitemmodel.h> diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro index 0a163fe6..510cac65 100644 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefontloader QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui network +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 62dd3aa7..714164da 100644 --- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -42,9 +42,9 @@ #include <qtest.h> #include <qdeclarativedatatest.h> #include <QtTest/QSignalSpy> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecontext.h> #include <private/qdeclarativefontloader_p.h> #include "../shared/testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro index 5b76ece3..63979826 100644 --- a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro +++ b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativegridview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativegridview.cpp diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp index f0d268c8..e6eac67d 100644 --- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp +++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp @@ -41,16 +41,16 @@ #include <QtTest/QtTest> #include <QtCore/qstringlistmodel.h> -#include <QtQuick1/qdeclarativeview.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeexpression.h> -#include <QtQuick1/private/qdeclarativeitem_p.h> -#include <QtQuick1/private/qlistmodelinterface_p.h> -#include <QtQuick1/private/qdeclarativegridview_p.h> -#include <QtQuick1/private/qdeclarativetext_p.h> -#include <QtQuick1/private/qdeclarativelistmodel_p.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeexpression.h> +#include <QtDeclarative/private/qdeclarativeitem_p.h> +#include <QtDeclarative/private/qlistmodelinterface_p.h> +#include <QtDeclarative/private/qdeclarativegridview_p.h> +#include <QtDeclarative/private/qdeclarativetext_p.h> +#include <QtDeclarative/private/qdeclarativelistmodel_p.h> class tst_QDeclarativeGridView : public QObject { diff --git a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro index 4bb3bb47..2db10a00 100644 --- a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeimage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets network +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 1d2c9115..15b5229e 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -44,14 +44,14 @@ #include <QTcpSocket> #include <QDir> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativeimage_p.h> #include <private/qdeclarativeimagebase_p.h> #include <private/qdeclarativeloader_p.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeexpression.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeexpression.h> #include <QtTest/QSignalSpy> #include <QtGui/qimagereader.h> diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index 443bd4f3..f57f9603 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeimageprovider QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp index d8894ed7..7e5ffb86 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp +++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QtTest> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativeimageprovider.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeimageprovider.h> #include <private/qdeclarativeimage_p.h> #include <QImageReader> #include <QWaitCondition> diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro index 8579bc5c..b71a6591 100644 --- a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro +++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeinfo QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 widgets +contains(QT_CONFIG,declarative): QT += declarative widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeinfo.cpp diff --git a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro index ae16bd9b..ae354f0e 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro +++ b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeinstruction QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private core-private SOURCES += tst_qdeclarativeinstruction.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro index febd5d56..d25b77a4 100644 --- a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro +++ b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeitem QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeitem.cpp diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index fc1585cb..ef5705d0 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativeitem_p.h> 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> diff --git a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro index 757ac1f5..87416bc6 100644 --- a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro +++ b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelayoutitem QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelayoutitem.cpp diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index 9bccc2ad..c9711b6c 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistmodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script-private core-private gui-private widgets-private QT += script macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 48818c93..482d2acd 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/private/qdeclarativeitem_p.h> -#include <QtQuick1/private/qdeclarativetext_p.h> -#include <QtQuick1/private/qdeclarativeengine_p.h> -#include <QtQuick1/private/qdeclarativelistmodel_p.h> -#include <QtQuick1/private/qdeclarativeexpression_p.h> +#include <QtDeclarative/private/qdeclarativeitem_p.h> +#include <QtDeclarative/private/qdeclarativetext_p.h> +#include <QtDeclarative/private/qdeclarativeengine_p.h> +#include <QtDeclarative/private/qdeclarativelistmodel_p.h> +#include <QtDeclarative/private/qdeclarativeexpression_p.h> #include <QDeclarativeComponent> #include <QtCore/qtimer.h> diff --git a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro index 8934703b..4c5dfeeb 100644 --- a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro +++ b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistreference QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelistreference.cpp diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp index 9047b3c2..9e60d6c2 100644 --- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp +++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp @@ -46,9 +46,9 @@ #include <QDir> #include <QDeclarativeEngine> #include <QDeclarativeComponent> -#include <QtQuick1/qdeclarative.h> -#include <QtQuick1/qdeclarativeprivate.h> -#include <QtQuick1/qdeclarativeproperty.h> +#include <QtDeclarative/qdeclarative.h> +#include <QtDeclarative/qdeclarativeprivate.h> +#include <QtDeclarative/qdeclarativeproperty.h> #include <QDebug> class tst_qdeclarativelistreference : public QDeclarativeDataTest diff --git a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro index f7e05710..b5911ac8 100644 --- a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro +++ b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets widgets-private gui-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui-private core-private script-private macx:CONFIG -= app_bundle HEADERS += incrementalmodel.h diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp index 935609c0..1bf624ee 100644 --- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp +++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp @@ -41,16 +41,16 @@ #include <QtTest/QtTest> #include <QtCore/QStringListModel> -#include <QtQuick1/qdeclarativeview.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeexpression.h> -#include <QtQuick1/private/qdeclarativeitem_p.h> -#include <QtQuick1/private/qdeclarativelistview_p.h> -#include <QtQuick1/private/qdeclarativetext_p.h> -#include <QtQuick1/private/qdeclarativevisualitemmodel_p.h> -#include <QtQuick1/private/qdeclarativelistmodel_p.h> -#include <QtQuick1/private/qlistmodelinterface_p.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeexpression.h> +#include <QtDeclarative/private/qdeclarativeitem_p.h> +#include <QtDeclarative/private/qdeclarativelistview_p.h> +#include <QtDeclarative/private/qdeclarativetext_p.h> +#include <QtDeclarative/private/qdeclarativevisualitemmodel_p.h> +#include <QtDeclarative/private/qdeclarativelistmodel_p.h> +#include <QtDeclarative/private/qlistmodelinterface_p.h> #include "incrementalmodel.h" class tst_QDeclarativeListView : public QObject diff --git a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro index 0d20098f..81b993c1 100644 --- a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeloader QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui network widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui network widgets macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp index dcdd01f5..1d268d58 100644 --- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp +++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp @@ -44,8 +44,8 @@ #include <QtWidgets/QGraphicsScene> #include <QSignalSpy> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativeloader_p.h> #include "testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro index 3c3cd811..256f3ebd 100644 --- a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro +++ b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativemetatype QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets SOURCES += tst_qdeclarativemetatype.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro index 18bb86e8..73fe8dcb 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1 include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp index cdbd2d2c..dbd209ba 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QStringList> -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include <QDebug> class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro index b541feec..ee453f63 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2 include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp index 4ed053b2..8d06d49f 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QStringList> -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include <QDebug> class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp index 801f056a..c6ca8777 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QStringList> -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include <QDebug> class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro index b4b04f3f..15e71ee8 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp index 4d41b145..f62e89e3 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QStringList> -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include <QDebug> class BarPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro index ff373856..9e5d8a1f 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp index 206386f7..c51d73e1 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QStringList> -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include <QDebug> class FloorPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro index 60d20baa..a688df46 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp index 1c00bc0e..ab7fab26 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QStringList> -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include <QDebug> class MyPlugin : public QDeclarativeExtensionPlugin diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro index d0b71171..57e22835 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp index f405ad2e..8c48d085 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QStringList> -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include <QDebug> class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro index 9be54cc8..202d4903 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative TARGET = Plugin DESTDIR = ../imports/com/nokia/WrongCase diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp index 3c4dba7c..3f7d9f56 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QStringList> -#include <QtQuick1/qdeclarativeextensionplugin.h> -#include <QtQuick1/qdeclarative.h> +#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtDeclarative/qdeclarative.h> #include <QDebug> // Note: this plugin is unused! diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro index 021e8cc7..f5400602 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/PureQmlModule include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index 8c91b29c..b357eea6 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -41,8 +41,8 @@ #include <qtest.h> #include <qdeclarativedatatest.h> #include <qdir.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <QDebug> #include <QtCore/qlibraryinfo.h> diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro index aa0355c0..ef95c170 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativemoduleplugin -QT += quick1 network testlib +QT += declarative network testlib CONFIG -= app_bundle HEADERS = ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro index 61f856a7..660c90bb 100644 --- a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro +++ b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativemousearea QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets gui network +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets gui network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp index 12397e2e..5933d8e3 100644 --- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp +++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp @@ -45,10 +45,10 @@ #include <private/qdeclarativemousearea_p.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativeflickable_p.h> -#include <QtQuick1/qdeclarativeview.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativeproperty.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeproperty.h> class tst_QDeclarativeMouseArea: public QObject { diff --git a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro index 136e6ae2..014cd170 100644 --- a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro +++ b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeparticles QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 widgets +contains(QT_CONFIG,declarative): QT += declarative widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeparticles.cpp diff --git a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro index 557b2b69..67fc41fb 100644 --- a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro +++ b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepathview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepathview.cpp diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp index a17d70cb..247c19e3 100644 --- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp +++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp @@ -40,17 +40,17 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtQuick1/qdeclarativeview.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeexpression.h> -#include <QtQuick1/private/qdeclarativepathview_p.h> -#include <QtQuick1/private/qdeclarativepath_p.h> -#include <QtQuick1/private/qdeclarativetext_p.h> -#include <QtQuick1/private/qdeclarativerectangle_p.h> -#include <QtQuick1/private/qdeclarativelistmodel_p.h> -#include <QtQuick1/private/qdeclarativevaluetype_p.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeexpression.h> +#include <QtDeclarative/private/qdeclarativepathview_p.h> +#include <QtDeclarative/private/qdeclarativepath_p.h> +#include <QtDeclarative/private/qdeclarativetext_p.h> +#include <QtDeclarative/private/qdeclarativerectangle_p.h> +#include <QtDeclarative/private/qdeclarativelistmodel_p.h> +#include <QtDeclarative/private/qdeclarativevaluetype_p.h> #include <QAbstractListModel> #include <QStringListModel> #include <QStandardItemModel> diff --git a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro index 768c0d2d..19e9272c 100644 --- a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro +++ b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepincharea QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepincharea.cpp diff --git a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp index b253908e..ccaf8532 100644 --- a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp +++ b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp @@ -45,8 +45,8 @@ #include <private/qdeclarativepincharea_p.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativeflickable_p.h> -#include <QtQuick1/qdeclarativeview.h> -#include <QtQuick1/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativecontext.h> #include <QtGui/qpa/qwindowsysteminterface.h> class tst_QDeclarativePinchArea: public QObject diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 38975854..1cc45276 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepixmapcache QT += testlib -contains(QT_CONFIG,quick1): QT += concurrent quick1 quick1-private network +contains(QT_CONFIG,declarative): QT += concurrent declarative declarative-private network macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 89acc1fe..d85fdefc 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -41,8 +41,8 @@ #include <qtest.h> #include <QtTest/QtTest> #include <private/qdeclarativepixmapcache_p.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativeimageprovider.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeimageprovider.h> #include <QNetworkReply> #include "testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro index 342cfebc..a6aecebf 100644 --- a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro +++ b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepositioners QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private gui-private widgets-private SOURCES += tst_qdeclarativepositioners.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro index 3e457b69..732774b8 100644 --- a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro +++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeproperty 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 macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeproperty.cpp diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp index b28cd341..2fe7cb13 100644 --- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp +++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include <qtest.h> #include <qdeclarativedatatest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeproperty.h> -#include <QtQuick1/private/qdeclarativeproperty_p.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeproperty.h> +#include <QtDeclarative/private/qdeclarativeproperty_p.h> #include <private/qdeclarativebinding_p.h> #include <QtWidgets/QLineEdit> #include <QtCore/qfileinfo.h> diff --git a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro index 57784346..d9706deb 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro +++ b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepropertymap QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepropertymap.cpp diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp index 8c76bb4d..b4fd2162 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp +++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativepropertymap.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativepropertymap.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativetext_p.h> #include <QSignalSpy> diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 5496edd4..fa372083 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeqt QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private core-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private core-private widgets SOURCES += tst_qdeclarativeqt.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro index 0f884230..9cb17a57 100644 --- a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro +++ b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativerepeater QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativerepeater.cpp diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp index 87142789..d4fb9e37 100644 --- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp +++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp @@ -43,10 +43,10 @@ #include <QtTest/QtTest> #include <QtTest/QSignalSpy> #include <private/qlistmodelinterface_p.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativeview.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeexpression.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeexpression.h> #include <private/qdeclarativerepeater_p.h> #include <private/qdeclarativetext_p.h> diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index a5dde298..556675ee 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativesmoothedanimation QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui core-private script-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesmoothedanimation.cpp diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index e8e36ddf..bedd3d80 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativesmoothedanimation_p.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativevaluetype_p.h> diff --git a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro index 79368203..da587545 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativespringanimation QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativespringanimation.cpp diff --git a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp index 7b3afec0..c3583b7d 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp +++ b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativespringanimation_p.h> #include <private/qdeclarativevaluetype_p.h> diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro index a58a3bbb..76730f32 100644 --- a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativestates QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private script-private widgets-private gui-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private script-private widgets-private gui-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestates.cpp diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp index 274ee197..f57afba5 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativeanchors_p_p.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativeimage_p.h> diff --git a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro index b4b932fa..edf81986 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro +++ b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativestyledtext QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro index d85f8b9b..3a08b5e0 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativesystempalette QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesystempalette.cpp diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp index c10b0e93..1779c6d8 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp +++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp @@ -41,8 +41,8 @@ #include <qtest.h> #include <QDebug> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativesystempalette_p.h> #include <qpalette.h> #include <QApplication> diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro index 77e83957..bd0ba7c4 100644 --- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetext QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets widgets-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private core-private script-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index 414bf3b9..ecafd795 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <qtest.h> #include <QTextDocument> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativetext_p.h> #include <private/qdeclarativetext_p_p.h> #include <private/qdeclarativevaluetype_p.h> diff --git a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro index e657d152..566ca6c6 100644 --- a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetextedit QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets widgets-private network core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private network core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetextedit.cpp ../shared/testhttpserver.cpp diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 45c686fd..9c899445 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -44,14 +44,14 @@ #include <math.h> #include <QFile> #include <QTextDocument> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeexpression.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeexpression.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativetextedit_p.h> #include <private/qdeclarativetextedit_p_p.h> #include <QFontMetrics> -#include <QtQuick1/QDeclarativeView> +#include <QtDeclarative/QDeclarativeView> #include <QDir> #include <QStyle> #include <QClipboard> diff --git a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro index d89c29ed..83ee832a 100644 --- a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro +++ b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetextinput QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets widgets-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetextinput.cpp diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index e705cf3a..f418372e 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include <QtQuick1/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeengine.h> #include <QFile> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativetextinput_p.h> #include <private/qdeclarativetextinput_p_p.h> #include <QDebug> diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro index 6cf72b80..4f15073a 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetimer QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetimer.cpp diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp index b451dd0d..decd2c34 100644 --- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp +++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include <QtTest/QSignalSpy> #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativetimer_p.h> -#include <QtQuick1/qdeclarativeitem.h> +#include <QtDeclarative/qdeclarativeitem.h> #include <QDebug> class tst_qdeclarativetimer : public QObject diff --git a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro index ad6821c6..11611bea 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro +++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativevaluetypes QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private script-private macx:CONFIG -= app_bundle HEADERS += testtypes.h diff --git a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro index 1bbf45b7..98824f4d 100644 --- a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro +++ b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui widgets +contains(QT_CONFIG,declarative): QT += declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeview.cpp diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp index b0e017d8..1d6dd121 100644 --- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp +++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeview.h> -#include <QtQuick1/qdeclarativeitem.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeitem.h> #include <QtWidgets/qgraphicswidget.h> class tst_QDeclarativeView : public QObject diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro index f60dbdfd..76dc50d8 100644 --- a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeviewer QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui +contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle include(../../../../tools/qml/qml.pri) diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index bcc9f158..3536f06b 100644 --- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include <qtest.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativeview.h> -#include <QtQuick1/qdeclarativeitem.h> -#include <QtQuick1/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeitem.h> +#include <QtDeclarative/qdeclarativecontext.h> #include <QtWidgets/qmenubar.h> #include <QSignalSpy> #include "qmlruntime.h" diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro index 061f1310..25615747 100644 --- a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro +++ b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativevisualdatamodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativevisualdatamodel.cpp diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp index 69a5b271..eeef9ab0 100644 --- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp +++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp @@ -41,11 +41,11 @@ #include <qtest.h> #include <QtTest/QSignalSpy> #include <QStandardItemModel> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativecontext.h> -#include <QtQuick1/qdeclarativeexpression.h> -#include <QtQuick1/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecontext.h> +#include <QtDeclarative/qdeclarativeexpression.h> +#include <QtDeclarative/qdeclarativeview.h> #include <private/qdeclarativelistview_p.h> #include <private/qdeclarativetext_p.h> #include <private/qdeclarativevisualitemmodel_p.h> diff --git a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro index 6c447805..1c1a5fac 100644 --- a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro +++ b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro @@ -9,7 +9,7 @@ SOURCES += ../shared/debugutil.cpp INCLUDEPATH += $$PWD/../../../../src/imports/webview -QT += testlib network webkit widgets quick1 quick1-private core-private widgets-private gui-private +QT += testlib network webkit widgets declarative declarative-private core-private widgets-private gui-private exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro index dd298932..8301f7dc 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro +++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeworkerscript QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeworkerscript.cpp diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp index 9c224f2c..77c9c75a 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp +++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp @@ -46,9 +46,9 @@ #include <QtCore/qfileinfo.h> #include <QtScript/qscriptengine.h> -#include <QtQuick1/qdeclarativecomponent.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativeitem.h> +#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeitem.h> #include <private/qdeclarativeworkerscript_p.h> #include <private/qdeclarativeengine_p.h> diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index 69ef5c25..85679451 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -3,7 +3,7 @@ testcase.timeout = 1200 # this is a slow test TARGET = tst_qdeclarativexmlhttprequest QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 network +contains(QT_CONFIG,declarative): QT += declarative network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index 131ea4b8..0776efca 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativexmllistmodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script gui network core-private script-private xmlpatterns +contains(QT_CONFIG,declarative): QT += declarative declarative-private script gui network core-private script-private xmlpatterns macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativexmllistmodel.cpp diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index ff70c006..e8c1d114 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -46,15 +46,15 @@ #include <qtest.h> #include <QtTest/qsignalspy.h> -#include <QtQuick1/qdeclarativenetworkaccessmanagerfactory.h> +#include <QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h> #include <QtNetwork/qnetworkaccessmanager.h> #include <QtNetwork/qnetworkrequest.h> #include <QtCore/qtimer.h> #include <QtCore/qfile.h> #include <QtCore/qtemporaryfile.h> -#include <QtQuick1/qdeclarativeengine.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativexmllistmodel_p.h> typedef QPair<int, int> QDeclarativeXmlListRange; diff --git a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro index c671cb38..7053b003 100644 --- a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro +++ b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qmlshadersplugin QT += testlib -QT += opengl quick1 gui widgets +QT += opengl declarative gui widgets SOURCES += tst_qmlshadersplugin.cpp SOURCES += \ diff --git a/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp b/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp index c15a8bdf..a69f2efd 100644 --- a/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp +++ b/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp @@ -41,7 +41,7 @@ #include <qtest.h> #include <qdeclarativedatatest.h> -#include <QtQuick1> +#include <QtDeclarative> #include "../../../../src/imports/shaders/shadereffectitem.h" #include "../../../../src/imports/shaders/shadereffectsource.h" #include "../../../../src/imports/shaders/shadereffect.h" diff --git a/tests/auto/declarative/qmlvisual/qmlvisual.pro b/tests/auto/declarative/qmlvisual/qmlvisual.pro index f79bce69..bf991199 100644 --- a/tests/auto/declarative/qmlvisual/qmlvisual.pro +++ b/tests/auto/declarative/qmlvisual/qmlvisual.pro @@ -3,7 +3,7 @@ testcase.timeout = 600 # this test is slow TARGET = tst_qmlvisual QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui widgets +contains(QT_CONFIG,declarative): QT += declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qmlvisual.cpp diff --git a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro index 92b3be20..131c53da 100644 --- a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro +++ b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qpacketprotocol QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qperformancetimer/qperformancetimer.pro b/tests/auto/declarative/qperformancetimer/qperformancetimer.pro index afd59c67..8e80a4a2 100644 --- a/tests/auto/declarative/qperformancetimer/qperformancetimer.pro +++ b/tests/auto/declarative/qperformancetimer/qperformancetimer.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qperformancetimer QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private SOURCES += tst_qperformancetimer.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h index 1c27fdbb..884e77a7 100644 --- a/tests/auto/declarative/shared/debugutil_p.h +++ b/tests/auto/declarative/shared/debugutil_p.h @@ -45,7 +45,7 @@ #include <QThread> #include <QTest> -#include <QtQuick1/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeengine.h> #include <private/qdeclarativedebugclient_p.h> #include <private/qdeclarativedebugservice_p.h> diff --git a/tests/auto/declarative/shared/qdeclarativedatatest.cpp b/tests/auto/declarative/shared/qdeclarativedatatest.cpp index 83d7fdfd..27fc4b90 100644 --- a/tests/auto/declarative/shared/qdeclarativedatatest.cpp +++ b/tests/auto/declarative/shared/qdeclarativedatatest.cpp @@ -41,10 +41,10 @@ #include "qdeclarativedatatest.h" -#include <QtQuick1/QDeclarativeComponent> -#include <QtQuick1/QDeclarativeError> -#include <QtQuick1/QDeclarativeContext> -#include <QtQuick1/QDeclarativeEngine> +#include <QtDeclarative/QDeclarativeComponent> +#include <QtDeclarative/QDeclarativeError> +#include <QtDeclarative/QDeclarativeContext> +#include <QtDeclarative/QDeclarativeEngine> #include <QtCore/QTextStream> QDeclarativeDataTest *QDeclarativeDataTest::m_instance = 0; diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 4b6ab95e..201fc143 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,4 +1,4 @@ -QT = core testlib gui quick1 +QT = core testlib gui declarative HEADERSCLEAN_PRI = $${QT.core.sources}/../../tests/auto/other/headersclean/headersclean.pri isEmpty(QT.core.sources)|!include($$HEADERSCLEAN_PRI) { warning("headersclean.pri from QtCore sources not available. test disabled") diff --git a/tests/auto/headersclean/qt_headersclean_headers.h b/tests/auto/headersclean/qt_headersclean_headers.h index c1e1b60f..2133ce46 100644 --- a/tests/auto/headersclean/qt_headersclean_headers.h +++ b/tests/auto/headersclean/qt_headersclean_headers.h @@ -42,6 +42,6 @@ #ifndef QT_HEADERSCLEAN_HEADERS #define QT_HEADERSCLEAN_HEADERS -#include <QtQuick1> +#include <QtDeclarative> #endif |