diff --git a/doc/src/quick/qtquick.qdoc b/doc/src/quick/qtquick.qdoc new file mode 100644 index 0000000000..358e9f8433 --- /dev/null +++ b/doc/src/quick/qtquick.qdoc @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \module QtQuick + \title Qt Quick Module + \ingroup modules + + \brief The Qt Quick module provides classes for embedding Qt Quick + in Qt/C++ applications. + + To include the definitions of the module's classes, use the + following directive: + + \code + #include + \endcode + + To link against the module, add this line to your \l qmake \c + .pro file: + + \code + QT += quick + \endcode + + For more information on the Qt Quick module, see the + \l{Qt Quick} documentation. +*/ diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp index e8ccdb7e36..4a13b7a597 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include /* diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 74d8db321d..18d7879900 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = networkaccessmanagerfactory DEPENDPATH += . INCLUDEPATH += . -QT += declarative network +QT += declarative quick network # Input SOURCES += main.cpp diff --git a/examples/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp index 205835a9c0..5cc49af684 100644 --- a/examples/declarative/minehunt/main.cpp +++ b/examples/declarative/minehunt/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro index cf928ce333..82dfc0d5bc 100644 --- a/examples/declarative/minehunt/minehunt.pro +++ b/examples/declarative/minehunt/minehunt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = minehunt -QT += declarative +QT += declarative quick # Input HEADERS += minehunt.h diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro index 6c51eed9d2..eaf2b30c89 100644 --- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro +++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro @@ -2,9 +2,9 @@ TEMPLATE = app TARGET = abstractitemmodel DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += declarative quick HEADERS = model.h SOURCES = main.cpp \ model.cpp -RESOURCES += abstractitemmodel.qrc \ No newline at end of file +RESOURCES += abstractitemmodel.qrc diff --git a/examples/declarative/modelviews/abstractitemmodel/main.cpp b/examples/declarative/modelviews/abstractitemmodel/main.cpp index 7924815879..d8c1abc939 100644 --- a/examples/declarative/modelviews/abstractitemmodel/main.cpp +++ b/examples/declarative/modelviews/abstractitemmodel/main.cpp @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include //![0] int main(int argc, char ** argv) diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp index 67ffb946c0..fc7252c864 100644 --- a/examples/declarative/modelviews/objectlistmodel/main.cpp +++ b/examples/declarative/modelviews/objectlistmodel/main.cpp @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include #include "dataobject.h" diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro index 8cc293dbfa..434e6f080b 100644 --- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro +++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = objectlistmodel DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += declarative quick # Input SOURCES += main.cpp \ diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp index ebd3c59307..d5ddbe8fb8 100644 --- a/examples/declarative/modelviews/stringlistmodel/main.cpp +++ b/examples/declarative/modelviews/stringlistmodel/main.cpp @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include /* diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro index 23dc481f88..d34f7d0b56 100644 --- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro +++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = stringlistmodel DEPENDPATH += . INCLUDEPATH += . -QT += declarative +QT += declarative quick # Input SOURCES += main.cpp diff --git a/examples/declarative/openglunderqml/main.cpp b/examples/declarative/openglunderqml/main.cpp index 44984c5be3..cb65c3feac 100644 --- a/examples/declarative/openglunderqml/main.cpp +++ b/examples/declarative/openglunderqml/main.cpp @@ -41,7 +41,7 @@ #include -#include +#include #include "squircle.h" diff --git a/examples/declarative/openglunderqml/openglunderqml.pro b/examples/declarative/openglunderqml/openglunderqml.pro index 3cd167335b..c93ac791fe 100644 --- a/examples/declarative/openglunderqml/openglunderqml.pro +++ b/examples/declarative/openglunderqml/openglunderqml.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick TEMPLATE = app DEPENDPATH += . diff --git a/examples/declarative/openglunderqml/squircle.cpp b/examples/declarative/openglunderqml/squircle.cpp index c2d4c0ac97..55c1dd092c 100644 --- a/examples/declarative/openglunderqml/squircle.cpp +++ b/examples/declarative/openglunderqml/squircle.cpp @@ -41,8 +41,8 @@ #include "squircle.h" -#include -#include +#include +#include #include Squircle::Squircle() diff --git a/examples/declarative/openglunderqml/squircle.h b/examples/declarative/openglunderqml/squircle.h index c92c93e2db..ab33c6a25f 100644 --- a/examples/declarative/openglunderqml/squircle.h +++ b/examples/declarative/openglunderqml/squircle.h @@ -42,7 +42,7 @@ #ifndef SQUIRCLE_H #define SQUIRCLE_H -#include +#include #include class Squircle : public QQuickItem diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/declarative/painteditem/smile/main.cpp index dc76e71185..0f69f4c962 100644 --- a/examples/declarative/painteditem/smile/main.cpp +++ b/examples/declarative/painteditem/smile/main.cpp @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include class MyPaintItem : public QQuickPaintedItem { Q_OBJECT diff --git a/examples/declarative/painteditem/smile/smile.pro b/examples/declarative/painteditem/smile/smile.pro index 3b9e4e0f62..780d351fe6 100644 --- a/examples/declarative/painteditem/smile/smile.pro +++ b/examples/declarative/painteditem/smile/smile.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = painteditem -QT += declarative +QT += declarative quick macx: CONFIG -= app_bundle diff --git a/examples/declarative/painteditem/textballoons/textballoon.h b/examples/declarative/painteditem/textballoons/textballoon.h index 064d20bd7e..e35107c1b2 100644 --- a/examples/declarative/painteditem/textballoons/textballoon.h +++ b/examples/declarative/painteditem/textballoons/textballoon.h @@ -42,7 +42,7 @@ #ifndef TEXTBALLOON_H #define TEXTBALLOON_H -#include +#include //! [0] class TextBalloon : public QQuickPaintedItem diff --git a/examples/declarative/painteditem/textballoons/textballoons.pro b/examples/declarative/painteditem/textballoons/textballoons.pro index 3148fd20e6..453a00336d 100644 --- a/examples/declarative/painteditem/textballoons/textballoons.pro +++ b/examples/declarative/painteditem/textballoons/textballoons.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += declarative quick TARGET = qmltextballoonplugin diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro index 0f0416718c..affc57ce1f 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro +++ b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp index 2670871e61..c507b2c30c 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp +++ b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include +#include #include int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h b/examples/declarative/tutorials/extending/chapter1-basics/piechart.h index d1beb71545..1bd3019f7b 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h +++ b/examples/declarative/tutorials/extending/chapter1-basics/piechart.h @@ -41,7 +41,7 @@ #define PIECHART_H //![0] -#include +#include #include class PieChart : public QQuickPaintedItem diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro index 0f0416718c..affc57ce1f 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro +++ b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp index 2670871e61..c507b2c30c 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp +++ b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include +#include #include int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h b/examples/declarative/tutorials/extending/chapter2-methods/piechart.h index 5205151a0a..4ed9e0665c 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h +++ b/examples/declarative/tutorials/extending/chapter2-methods/piechart.h @@ -40,7 +40,7 @@ #ifndef PIECHART_H #define PIECHART_H -#include +#include #include //![0] diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro index 0f0416718c..affc57ce1f 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro +++ b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp index 2670871e61..c507b2c30c 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp +++ b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include "piechart.h" -#include +#include #include int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h index 55be2a493f..7c5fda2744 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h +++ b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h @@ -41,7 +41,7 @@ #define PIECHART_H #include -#include +#include //![0] class PieChart : public QQuickPaintedItem diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index c3f5402aea..6724fa0375 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h \ pieslice.h diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp index c9b9a0b5aa..5d1c4d6839 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp @@ -40,7 +40,7 @@ #include "piechart.h" #include "pieslice.h" -#include +#include #include //![0] diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h index c1cdf30805..36a866dfc3 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h @@ -40,7 +40,7 @@ #ifndef PIECHART_H #define PIECHART_H -#include +#include class PieSlice; diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h index 59606486a4..23913adf84 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h @@ -40,7 +40,7 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include +#include #include //![0] diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index c3f5402aea..6724fa0375 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += declarative quick HEADERS += piechart.h \ pieslice.h diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp index 78f6f25485..afd34455c8 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp @@ -40,7 +40,7 @@ #include "piechart.h" #include "pieslice.h" -#include +#include #include int main(int argc, char *argv[]) diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h index feea3d2789..5ba6b10b7a 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h @@ -40,7 +40,7 @@ #ifndef PIECHART_H #define PIECHART_H -#include +#include class PieSlice; diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h index 157e9cda77..a9174fbe0c 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h @@ -40,7 +40,7 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include +#include #include //![0] diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 47fe0a2fde..c243ec4572 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += declarative quick DESTDIR = ChartsPlugin TARGET = chartsplugin diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h index 2d58360245..927dc25e5c 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h +++ b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h @@ -40,7 +40,7 @@ #ifndef PIECHART_H #define PIECHART_H -#include +#include class PieSlice; diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h index 4251e49396..c09b37d1c8 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h +++ b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h @@ -40,7 +40,7 @@ #ifndef PIESLICE_H #define PIESLICE_H -#include +#include #include class PieSlice : public QQuickPaintedItem diff --git a/modules/qt_quick.pri b/modules/qt_quick.pri new file mode 100644 index 0000000000..0dc827b732 --- /dev/null +++ b/modules/qt_quick.pri @@ -0,0 +1,17 @@ +QT.quick.VERSION = 5.0.0 +QT.quick.MAJOR_VERSION = 5 +QT.quick.MINOR_VERSION = 0 +QT.quick.PATCH_VERSION = 0 + +QT.quick.name = QtQuick +QT.quick.bins = $$QT_MODULE_BIN_BASE +QT.quick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuick +QT.quick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuick/$$QT.quick.VERSION +QT.quick.sources = $$QT_MODULE_BASE/src/quick +QT.quick.libs = $$QT_MODULE_LIB_BASE +QT.quick.plugins = $$QT_MODULE_PLUGIN_BASE +QT.quick.imports = $$QT_MODULE_IMPORT_BASE +QT.quick.depends = declarative +QT.quick.DEFINES = QT_QUICK_LIB + +QT_CONFIG += quick diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h index 7c74c63801..c2ee93b665 100644 --- a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h +++ b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h @@ -66,7 +66,7 @@ class QDeclarativeWatcher; class QDataStream; class QDeclarativeDebugStatesDelegate; -class QDeclarativeEngineDebugService : public QDeclarativeDebugService +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebugService : public QDeclarativeDebugService { Q_OBJECT public: diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 265e4eba33..ca81a4a3d3 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -31,10 +31,3 @@ HEADERS += qtdeclarativeversion.h include(util/util.pri) include(qml/qml.pri) include(debugger/debugger.pri) -include(scenegraph/scenegraph.pri) -include(items/items.pri) -include(particles/particles.pri) -include(designer/designer.pri) - -HEADERS += qtquick2_p.h -SOURCES += qtquick2.cpp diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index ea68291942..49b3d037ad 100644 --- a/src/declarative/qml/qdeclarativecomponent_p.h +++ b/src/declarative/qml/qdeclarativecomponent_p.h @@ -78,7 +78,7 @@ class QDeclarativeEngine; class QDeclarativeCompiledData; class QDeclarativeComponentAttached; -class Q_AUTOTEST_EXPORT QDeclarativeComponentPrivate : public QObjectPrivate, public QDeclarativeTypeData::TypeDataCallback +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeComponentPrivate : public QObjectPrivate, public QDeclarativeTypeData::TypeDataCallback { Q_DECLARE_PUBLIC(QDeclarativeComponent) diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index d0d095567e..ee42f0b7c3 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -83,7 +83,6 @@ #include -#include #include #ifdef Q_OS_WIN // for %APPDATA% @@ -159,7 +158,6 @@ void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor) \endcode */ -static bool qt_QmlQtModule_registered = false; bool QDeclarativeEnginePrivate::qml_debugging_enabled = false; void QDeclarativeEnginePrivate::registerBaseTypes(const char *uri, int versionMajor, int versionMinor) @@ -343,10 +341,6 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e) scarceResourcesRefCount(0), typeLoader(e), importDatabase(e), uniqueId(1), incubatorCount(0), incubationController(0), mutex(QMutex::Recursive) { - if (!qt_QmlQtModule_registered) { - qt_QmlQtModule_registered = true; - QDeclarativeQtQuick2Module::defineModule(); - } } QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate() diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h index 7a2bda218f..7b53bab093 100644 --- a/src/declarative/qml/qdeclarativeexpression_p.h +++ b/src/declarative/qml/qdeclarativeexpression_p.h @@ -168,7 +168,7 @@ class QDeclarativeJavaScriptExpression : public QDeclarativeAbstractExpression, class QDeclarativeExpression; class QString; -class QDeclarativeExpressionPrivate : public QObjectPrivate, public QDeclarativeJavaScriptExpression +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeExpressionPrivate : public QObjectPrivate, public QDeclarativeJavaScriptExpression { Q_DECLARE_PUBLIC(QDeclarativeExpression) public: diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 46395e15e8..c175d725b8 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -1899,7 +1899,6 @@ int QDeclarativeMetaType::QQuickAnchorLineMetaTypeId() static int id = 0; if (!id) { id = QMetaType::type("QQuickAnchorLine"); - Q_ASSERT(id != 0); } return id; } diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index 3122cd24bb..01d4247ff8 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -1,61 +1,5 @@ SOURCES += \ - $$PWD/qdeclarativeutilmodule.cpp\ - $$PWD/qdeclarativeconnections.cpp \ - $$PWD/qdeclarativepackage.cpp \ - $$PWD/qdeclarativeanimation.cpp \ - $$PWD/qdeclarativesystempalette.cpp \ - $$PWD/qdeclarativespringanimation.cpp \ - $$PWD/qdeclarativesmoothedanimation.cpp \ - $$PWD/qdeclarativestate.cpp\ - $$PWD/qdeclarativetransitionmanager.cpp \ - $$PWD/qdeclarativestateoperations.cpp \ - $$PWD/qdeclarativepropertychanges.cpp \ - $$PWD/qdeclarativestategroup.cpp \ - $$PWD/qdeclarativetransition.cpp \ - $$PWD/qdeclarativelistaccessor.cpp \ - $$PWD/qdeclarativetimeline.cpp \ - $$PWD/qdeclarativetimer.cpp \ - $$PWD/qdeclarativebind.cpp \ - $$PWD/qdeclarativepropertymap.cpp \ - $$PWD/qdeclarativepixmapcache.cpp \ - $$PWD/qdeclarativebehavior.cpp \ - $$PWD/qdeclarativefontloader.cpp \ - $$PWD/qdeclarativestyledtext.cpp \ - $$PWD/qdeclarativepath.cpp \ - $$PWD/qdeclarativechangeset.cpp \ - $$PWD/qdeclarativelistcompositor.cpp \ - $$PWD/qdeclarativepathinterpolator.cpp \ - $$PWD/qdeclarativesvgparser.cpp + $$PWD/qdeclarativepropertymap.cpp HEADERS += \ - $$PWD/qdeclarativeutilmodule_p.h\ - $$PWD/qdeclarativeconnections_p.h \ - $$PWD/qdeclarativepackage_p.h \ - $$PWD/qdeclarativeanimation_p.h \ - $$PWD/qdeclarativeanimation_p_p.h \ - $$PWD/qdeclarativesystempalette_p.h \ - $$PWD/qdeclarativespringanimation_p.h \ - $$PWD/qdeclarativesmoothedanimation_p.h \ - $$PWD/qdeclarativesmoothedanimation_p_p.h \ - $$PWD/qdeclarativestate_p.h\ - $$PWD/qdeclarativestateoperations_p.h \ - $$PWD/qdeclarativepropertychanges_p.h \ - $$PWD/qdeclarativestate_p_p.h\ - $$PWD/qdeclarativetransitionmanager_p_p.h \ - $$PWD/qdeclarativestategroup_p.h \ - $$PWD/qdeclarativetransition_p.h \ - $$PWD/qdeclarativelistaccessor_p.h \ - $$PWD/qdeclarativetimeline_p_p.h \ - $$PWD/qdeclarativetimer_p.h \ - $$PWD/qdeclarativebind_p.h \ - $$PWD/qdeclarativepropertymap.h \ - $$PWD/qdeclarativepixmapcache_p.h \ - $$PWD/qdeclarativebehavior_p.h \ - $$PWD/qdeclarativefontloader_p.h \ - $$PWD/qdeclarativestyledtext_p.h \ - $$PWD/qdeclarativepath_p.h \ - $$PWD/qdeclarativepath_p_p.h \ - $$PWD/qdeclarativechangeset_p.h \ - $$PWD/qdeclarativelistcompositor_p.h \ - $$PWD/qdeclarativepathinterpolator_p.h \ - $$PWD/qdeclarativesvgparser_p.h \ No newline at end of file + $$PWD/qdeclarativepropertymap.h diff --git a/src/imports/etcprovider/etcprovider.pro b/src/imports/etcprovider/etcprovider.pro index b48235eed8..3ec3ab5d09 100644 --- a/src/imports/etcprovider/etcprovider.pro +++ b/src/imports/etcprovider/etcprovider.pro @@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/etcprovider include(../qimportbase.pri) !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL -QT += declarative opengl +QT += declarative quick opengl SOURCES += qetcprovider.cpp plugin.cpp HEADERS += qetcprovider.h plugin.h diff --git a/src/imports/etcprovider/qetcprovider.h b/src/imports/etcprovider/qetcprovider.h index cac37584d4..42c8e410db 100644 --- a/src/imports/etcprovider/qetcprovider.h +++ b/src/imports/etcprovider/qetcprovider.h @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 35590b221d..18400f86f2 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += qtquick1 qt47 folderlistmodel particles gestures etcprovider +SUBDIRS += qtquick2 qtquick1 qt47 folderlistmodel particles gestures etcprovider contains(QT_CONFIG, qmltest): SUBDIRS += testlib -contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel \ No newline at end of file +contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp new file mode 100644 index 0000000000..a0def068d9 --- /dev/null +++ b/src/imports/qtquick2/plugin.cpp @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include + +QT_BEGIN_NAMESPACE + +//![class decl] +class QtQuick2Plugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT +public: + virtual void registerTypes(const char *uri) + { + Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick")); + QDeclarativeQtQuick2Module::defineModule(); + } +}; +//![class decl] + +QT_END_NAMESPACE + +#include "plugin.moc" + +//![plugin export decl] +Q_EXPORT_PLUGIN2(qtquick2plugin, QT_PREPEND_NAMESPACE(QtQuick2Plugin)); +//![plugin export decl] + diff --git a/src/imports/qtquick2/qmldir b/src/imports/qtquick2/qmldir new file mode 100644 index 0000000000..bb4d33a5be --- /dev/null +++ b/src/imports/qtquick2/qmldir @@ -0,0 +1 @@ +plugin qtquick2plugin diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro new file mode 100644 index 0000000000..3f76abd87f --- /dev/null +++ b/src/imports/qtquick2/qtquick2.pro @@ -0,0 +1,19 @@ +TARGET = qtquick2plugin +TARGETPATH = QtQuick.2 +include(../qimportbase.pri) + +SOURCES += \ + plugin.cpp + +QT += quick-private declarative-private + +OTHER_FILES += \ + qmldir + +DESTDIR = $$QT.declarative.imports/$$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +qmldir.files += $$PWD/qmldir +qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +INSTALLS += target qmldir diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index c7d7d9191e..0d3669970f 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -46,7 +46,7 @@ #include "QtQuickTest/private/quicktestresult_p.h" #include "QtQuickTest/private/quicktestevent_p.h" #include "private/qtestoptions_p.h" -#include "QtDeclarative/qquickitem.h" +#include "QtQuick/qquickitem.h" #include QML_DECLARE_TYPE(QuickTestResult) diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro index dbe45fb6fa..3b8a5bf75e 100644 --- a/src/imports/testlib/testlib.pro +++ b/src/imports/testlib/testlib.pro @@ -4,7 +4,7 @@ include(../qimportbase.pri) CONFIG += qt plugin -QT += declarative qmltest qmltest-private v8-private declarative-private core-private testlib +QT += declarative quick qmltest qmltest-private v8-private declarative-private core-private testlib SOURCES += main.cpp HEADERS += diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro index a06c1bdc10..ed6ba4cf29 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro @@ -1,7 +1,7 @@ load(qt_module) TARGET = qmldbg_qtquick2 -QT += declarative-private core-private gui-private opengl-private v8-private +QT += declarative-private quick-private core-private gui-private opengl-private v8-private load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp index 5ed919c87c..33b8cc1b4e 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include namespace QmlJSDebugger { namespace QtQuick2 { diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h index 8ba1af6576..d6c380e0d2 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h @@ -43,7 +43,7 @@ #define SGHIGHLIGHT_H #include -#include +#include namespace QmlJSDebugger { namespace QtQuick2 { diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp index 4d5fc3738d..f96f7d2422 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp @@ -45,8 +45,8 @@ #include "sgviewinspector.h" #include -#include -#include +#include +#include namespace QmlJSDebugger { namespace QtQuick2 { diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp index 06eb6eac97..a1c2c1a1b2 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp @@ -45,10 +45,10 @@ #include "sghighlight.h" #include "sgselectiontool.h" -#include +#include -#include -#include +#include +#include #include diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index ff04487b18..cc2466639c 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -7,7 +7,7 @@ CONFIG += module CONFIG += dll warn_on declarative_debug MODULE_PRI += ../../modules/qt_qmltest.pri -QT += testlib-private declarative testlib qtquick1 widgets widgets-private gui +QT += testlib-private declarative testlib quick qtquick1 widgets widgets-private gui DEFINES += QT_BUILD_QUICK_TEST_LIB QT_NO_URL_CAST_FROM_STRING diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 976b4d6de0..65107ee717 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -49,7 +49,7 @@ #include #include #if defined(QML_VERSION) && QML_VERSION >= 0x020000 -#include +#include #define QUICK_TEST_SCENEGRAPH 1 #endif #include diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp index 780d502f52..e865954460 100644 --- a/src/qmltest/quicktestevent.cpp +++ b/src/qmltest/quicktestevent.cpp @@ -45,8 +45,8 @@ #include #include #if defined(QML_VERSION) && QML_VERSION >= 0x020000 -#include -#include +#include +#include #define QUICK_TEST_SCENEGRAPH 1 #endif #include diff --git a/src/declarative/designer/designer.pri b/src/quick/designer/designer.pri similarity index 100% rename from src/declarative/designer/designer.pri rename to src/quick/designer/designer.pri diff --git a/src/declarative/designer/designersupport.cpp b/src/quick/designer/designersupport.cpp similarity index 98% rename from src/declarative/designer/designersupport.cpp rename to src/quick/designer/designersupport.cpp index 9c565c138c..04a176f511 100644 --- a/src/declarative/designer/designersupport.cpp +++ b/src/quick/designer/designersupport.cpp @@ -42,11 +42,11 @@ #include "designersupport.h" #include -#include -#include +#include +#include #include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/designer/designersupport.h b/src/quick/designer/designersupport.h similarity index 98% rename from src/declarative/designer/designersupport.h rename to src/quick/designer/designersupport.h index 7654363276..18546eca66 100644 --- a/src/declarative/designer/designersupport.h +++ b/src/quick/designer/designersupport.h @@ -54,6 +54,7 @@ // +#include #include #include #include @@ -62,8 +63,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickItem; class QQuickShaderEffectTexture; class QImage; @@ -72,7 +71,7 @@ class QDeclarativeContext; class QQuickView; -class Q_DECLARATIVE_EXPORT DesignerSupport +class Q_QUICK_EXPORT DesignerSupport { public: enum DirtyType { diff --git a/src/declarative/items/checksync.pl b/src/quick/items/checksync.pl similarity index 100% rename from src/declarative/items/checksync.pl rename to src/quick/items/checksync.pl diff --git a/src/declarative/items/context2d/context2d.pri b/src/quick/items/context2d/context2d.pri similarity index 100% rename from src/declarative/items/context2d/context2d.pri rename to src/quick/items/context2d/context2d.pri diff --git a/src/declarative/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp similarity index 99% rename from src/declarative/items/context2d/qquickcanvasitem.cpp rename to src/quick/items/context2d/qquickcanvasitem.cpp index 81b7a49722..32809babed 100644 --- a/src/declarative/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -45,7 +45,7 @@ #include "qquickcontext2d_p.h" #include "qquickcontext2dnode_p.h" #include "qquickcontext2dtexture_p.h" -#include +#include #include #include diff --git a/src/declarative/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h similarity index 97% rename from src/declarative/items/context2d/qquickcanvasitem_p.h rename to src/quick/items/context2d/qquickcanvasitem_p.h index 293434209a..70ca475c96 100644 --- a/src/declarative/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -42,17 +42,16 @@ #ifndef QQUICKCANVASITEM_P_H #define QQUICKCANVASITEM_P_H -#include +#include #include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) class QQuickContext2D; class QQuickCanvasItemPrivate; -class Q_DECLARATIVE_EXPORT QQuickCanvasItem : public QQuickItem +class Q_QUICK_EXPORT QQuickCanvasItem : public QQuickItem { Q_OBJECT Q_ENUMS(RenderTarget) diff --git a/src/declarative/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp similarity index 99% rename from src/declarative/items/context2d/qquickcontext2d.cpp rename to src/quick/items/context2d/qquickcontext2d.cpp index 1f7a84baa6..d5d57132bf 100644 --- a/src/declarative/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -43,11 +43,11 @@ #include "qquickcontext2dcommandbuffer_p.h" #include "qquickcanvasitem_p.h" #include -#include +#include #include #include -#include +#include #include #include diff --git a/src/declarative/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h similarity index 98% rename from src/declarative/items/context2d/qquickcontext2d_p.h rename to src/quick/items/context2d/qquickcontext2d_p.h index c5634d2b18..0f320d9a7f 100644 --- a/src/declarative/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -42,6 +42,7 @@ #ifndef QQUICKCONTEXT2D_P_H #define QQUICKCONTEXT2D_P_H +#include #include #include @@ -63,13 +64,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickCanvasItem; class QQuickContext2DCommandBuffer; class QDeclarativePixmap; -class Q_DECLARATIVE_EXPORT QQuickContext2D +class Q_QUICK_EXPORT QQuickContext2D { public: enum TextBaseLineType { Alphabetic=0, Top, Middle, Bottom, Hanging}; diff --git a/src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp b/src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp similarity index 100% rename from src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp rename to src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp diff --git a/src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h similarity index 99% rename from src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h rename to src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h index 7deb2fbd6e..2029198648 100644 --- a/src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h +++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h @@ -43,15 +43,13 @@ #define QQUICKCONTEXT2DCOMMANDBUFFER_P_H #include "qquickcontext2d_p.h" -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickCanvasItem; class QMutex; diff --git a/src/declarative/items/context2d/qquickcontext2dnode.cpp b/src/quick/items/context2d/qquickcontext2dnode.cpp similarity index 98% rename from src/declarative/items/context2d/qquickcontext2dnode.cpp rename to src/quick/items/context2d/qquickcontext2dnode.cpp index 76b50d9747..445cde8964 100644 --- a/src/declarative/items/context2d/qquickcontext2dnode.cpp +++ b/src/quick/items/context2d/qquickcontext2dnode.cpp @@ -41,7 +41,7 @@ #include "qquickcontext2dnode_p.h" -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/context2d/qquickcontext2dnode_p.h b/src/quick/items/context2d/qquickcontext2dnode_p.h similarity index 97% rename from src/declarative/items/context2d/qquickcontext2dnode_p.h rename to src/quick/items/context2d/qquickcontext2dnode_p.h index 7403acaf07..a00c939896 100644 --- a/src/declarative/items/context2d/qquickcontext2dnode_p.h +++ b/src/quick/items/context2d/qquickcontext2dnode_p.h @@ -42,8 +42,8 @@ #ifndef QQUICKCONTEXT2DNODE_P_H #define QQUICKCONTEXT2DNODE_P_H -#include -#include +#include +#include #include "qquickcanvasitem_p.h" #include "qquickcontext2dtexture_p.h" @@ -53,8 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickContext2DNode : public QSGGeometryNode { public: diff --git a/src/declarative/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp similarity index 99% rename from src/declarative/items/context2d/qquickcontext2dtexture.cpp rename to src/quick/items/context2d/qquickcontext2dtexture.cpp index 1128fa224f..cbf1571189 100644 --- a/src/declarative/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -43,7 +43,7 @@ #include "qquickcontext2dtile_p.h" #include "qquickcanvasitem_p.h" #include -#include +#include #include "qquickcontext2dcommandbuffer_p.h" #include diff --git a/src/declarative/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h similarity index 99% rename from src/declarative/items/context2d/qquickcontext2dtexture_p.h rename to src/quick/items/context2d/qquickcontext2dtexture_p.h index ed45a09f7c..d055db7c06 100644 --- a/src/declarative/items/context2d/qquickcontext2dtexture_p.h +++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h @@ -42,7 +42,7 @@ #ifndef QQUICKCONTEXT2DTEXTURE_P_H #define QQUICKCONTEXT2DTEXTURE_P_H -#include +#include #include "qquickcanvasitem_p.h" #include "qquickcontext2d_p.h" @@ -57,8 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickContext2DTile; class QQuickContext2DCommandBuffer; diff --git a/src/declarative/items/context2d/qquickcontext2dtile.cpp b/src/quick/items/context2d/qquickcontext2dtile.cpp similarity index 100% rename from src/declarative/items/context2d/qquickcontext2dtile.cpp rename to src/quick/items/context2d/qquickcontext2dtile.cpp diff --git a/src/declarative/items/context2d/qquickcontext2dtile_p.h b/src/quick/items/context2d/qquickcontext2dtile_p.h similarity index 99% rename from src/declarative/items/context2d/qquickcontext2dtile_p.h rename to src/quick/items/context2d/qquickcontext2dtile_p.h index 92c59efbcf..a38384d3c7 100644 --- a/src/declarative/items/context2d/qquickcontext2dtile_p.h +++ b/src/quick/items/context2d/qquickcontext2dtile_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickContext2DTexture; class QQuickContext2DCommandBuffer; diff --git a/src/declarative/items/items.pri b/src/quick/items/items.pri similarity index 100% rename from src/declarative/items/items.pri rename to src/quick/items/items.pri diff --git a/src/declarative/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp similarity index 100% rename from src/declarative/items/qquickanchors.cpp rename to src/quick/items/qquickanchors.cpp diff --git a/src/declarative/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h similarity index 98% rename from src/declarative/items/qquickanchors_p.h rename to src/quick/items/qquickanchors_p.h index 5c66c2e17d..6f2224f0d4 100644 --- a/src/declarative/items/qquickanchors_p.h +++ b/src/quick/items/qquickanchors_p.h @@ -47,18 +47,16 @@ #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickItem; class QQuickAnchorsPrivate; class QQuickAnchorLine; -class Q_DECLARATIVE_PRIVATE_EXPORT QQuickAnchors : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickAnchors : public QObject { Q_OBJECT diff --git a/src/declarative/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h similarity index 100% rename from src/declarative/items/qquickanchors_p_p.h rename to src/quick/items/qquickanchors_p_p.h diff --git a/src/declarative/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp similarity index 100% rename from src/declarative/items/qquickanimatedimage.cpp rename to src/quick/items/qquickanimatedimage.cpp diff --git a/src/declarative/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h similarity index 99% rename from src/declarative/items/qquickanimatedimage_p.h rename to src/quick/items/qquickanimatedimage_p.h index ae96e4cc15..0bb3ad73f5 100644 --- a/src/declarative/items/qquickanimatedimage_p.h +++ b/src/quick/items/qquickanimatedimage_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QMovie; class QQuickAnimatedImagePrivate; diff --git a/src/declarative/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h similarity index 100% rename from src/declarative/items/qquickanimatedimage_p_p.h rename to src/quick/items/qquickanimatedimage_p_p.h diff --git a/src/declarative/items/qquickanimation.cpp b/src/quick/items/qquickanimation.cpp similarity index 100% rename from src/declarative/items/qquickanimation.cpp rename to src/quick/items/qquickanimation.cpp diff --git a/src/declarative/items/qquickanimation_p.h b/src/quick/items/qquickanimation_p.h similarity index 99% rename from src/declarative/items/qquickanimation_p.h rename to src/quick/items/qquickanimation_p.h index 2ce72249e2..bf38bd4d9f 100644 --- a/src/declarative/items/qquickanimation_p.h +++ b/src/quick/items/qquickanimation_p.h @@ -45,7 +45,7 @@ #include "qquickitem.h" -#include +#include #include @@ -53,8 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickParentAnimationPrivate; class QQuickParentAnimation : public QDeclarativeAnimationGroup { diff --git a/src/declarative/items/qquickanimation_p_p.h b/src/quick/items/qquickanimation_p_p.h similarity index 100% rename from src/declarative/items/qquickanimation_p_p.h rename to src/quick/items/qquickanimation_p_p.h diff --git a/src/declarative/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp similarity index 100% rename from src/declarative/items/qquickborderimage.cpp rename to src/quick/items/qquickborderimage.cpp diff --git a/src/declarative/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h similarity index 99% rename from src/declarative/items/qquickborderimage_p.h rename to src/quick/items/qquickborderimage_p.h index 0af6fca55d..936467d580 100644 --- a/src/declarative/items/qquickborderimage_p.h +++ b/src/quick/items/qquickborderimage_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickScaleGrid; class QQuickGridScaledImage; class QQuickBorderImagePrivate; diff --git a/src/declarative/items/qquickborderimage_p_p.h b/src/quick/items/qquickborderimage_p_p.h similarity index 100% rename from src/declarative/items/qquickborderimage_p_p.h rename to src/quick/items/qquickborderimage_p_p.h diff --git a/src/declarative/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp similarity index 99% rename from src/declarative/items/qquickcanvas.cpp rename to src/quick/items/qquickcanvas.cpp index 8022af98f4..9c6ab08fc7 100644 --- a/src/declarative/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.cpp @@ -45,10 +45,10 @@ #include "qquickitem.h" #include "qquickitem_p.h" -#include -#include +#include +#include #include -#include +#include #include #include @@ -844,6 +844,8 @@ void QQuickCanvasPrivate::cleanup(QSGNode *n) \since QtQuick 2.0 \brief The QQuickCanvas class provides the canvas for displaying a graphical QML scene + \inmodule QtQuick + QQuickCanvas provides the graphical scene management needed to interact with and display a scene of QQuickItems. diff --git a/src/declarative/items/qquickcanvas.h b/src/quick/items/qquickcanvas.h similarity index 98% rename from src/declarative/items/qquickcanvas.h rename to src/quick/items/qquickcanvas.h index c27776f234..9ea73b087b 100644 --- a/src/declarative/items/qquickcanvas.h +++ b/src/quick/items/qquickcanvas.h @@ -42,6 +42,7 @@ #ifndef QQUICKCANVAS_H #define QQUICKCANVAS_H +#include #include #include #include @@ -51,8 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGEngine; class QQuickItem; class QSGTexture; @@ -62,7 +61,7 @@ class QOpenGLFramebufferObject; class QDeclarativeIncubationController; class QInputMethodEvent; -class Q_DECLARATIVE_EXPORT QQuickCanvas : public QWindow +class Q_QUICK_EXPORT QQuickCanvas : public QWindow { Q_OBJECT Q_PRIVATE_PROPERTY(QQuickCanvas::d_func(), QDeclarativeListProperty data READ data DESIGNABLE false) diff --git a/src/declarative/items/qquickcanvas_p.h b/src/quick/items/qquickcanvas_p.h similarity index 99% rename from src/declarative/items/qquickcanvas_p.h rename to src/quick/items/qquickcanvas_p.h index 13ca288cb1..633f382954 100644 --- a/src/declarative/items/qquickcanvas_p.h +++ b/src/quick/items/qquickcanvas_p.h @@ -57,7 +57,7 @@ #include "qquickcanvas.h" #include -#include +#include #include #include diff --git a/src/declarative/items/qquickclipnode.cpp b/src/quick/items/qquickclipnode.cpp similarity index 100% rename from src/declarative/items/qquickclipnode.cpp rename to src/quick/items/qquickclipnode.cpp diff --git a/src/declarative/items/qquickclipnode_p.h b/src/quick/items/qquickclipnode_p.h similarity index 98% rename from src/declarative/items/qquickclipnode_p.h rename to src/quick/items/qquickclipnode_p.h index 0323c9a24a..ee85409c9d 100644 --- a/src/declarative/items/qquickclipnode_p.h +++ b/src/quick/items/qquickclipnode_p.h @@ -42,7 +42,7 @@ #ifndef QQUICKCLIPNODE_P_H #define QQUICKCLIPNODE_P_H -#include +#include class QQuickDefaultClipNode : public QSGClipNode { diff --git a/src/declarative/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp similarity index 99% rename from src/declarative/items/qquickdrag.cpp rename to src/quick/items/qquickdrag.cpp index 9dcc4ac7fe..12d8cbea98 100644 --- a/src/declarative/items/qquickdrag.cpp +++ b/src/quick/items/qquickdrag.cpp @@ -42,7 +42,7 @@ #include "qquickdrag_p.h" #include -#include +#include #include #include diff --git a/src/declarative/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h similarity index 99% rename from src/declarative/items/qquickdrag_p.h rename to src/quick/items/qquickdrag_p.h index 1d950299d7..830c665899 100644 --- a/src/declarative/items/qquickdrag_p.h +++ b/src/quick/items/qquickdrag_p.h @@ -43,7 +43,7 @@ #ifndef QQUICKDRAG_P_H #define QQUICKDRAG_P_H -#include +#include #include @@ -55,8 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickItem; class QQuickDrag; class QQuickDragPrivate; diff --git a/src/declarative/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp similarity index 100% rename from src/declarative/items/qquickdroparea.cpp rename to src/quick/items/qquickdroparea.cpp diff --git a/src/declarative/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h similarity index 99% rename from src/declarative/items/qquickdroparea_p.h rename to src/quick/items/qquickdroparea_p.h index 31e2bd7813..6662b21faf 100644 --- a/src/declarative/items/qquickdroparea_p.h +++ b/src/quick/items/qquickdroparea_p.h @@ -53,8 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickDropAreaPrivate; class QQuickDropEvent : public QObject { diff --git a/src/declarative/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp similarity index 100% rename from src/declarative/items/qquickevents.cpp rename to src/quick/items/qquickevents.cpp diff --git a/src/declarative/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h similarity index 98% rename from src/declarative/items/qquickevents_p_p.h rename to src/quick/items/qquickevents_p_p.h index cc5ed4f01e..81eb0dfd06 100644 --- a/src/declarative/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -54,6 +54,7 @@ // We mean it. // +#include #include #include @@ -91,7 +92,7 @@ class QQuickKeyEvent : public QObject }; // used in QtLocation -class Q_DECLARATIVE_EXPORT QQuickMouseEvent : public QObject +class Q_QUICK_EXPORT QQuickMouseEvent : public QObject { Q_OBJECT Q_PROPERTY(qreal x READ x) diff --git a/src/declarative/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp similarity index 100% rename from src/declarative/items/qquickflickable.cpp rename to src/quick/items/qquickflickable.cpp diff --git a/src/declarative/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h similarity index 99% rename from src/declarative/items/qquickflickable_p.h rename to src/quick/items/qquickflickable_p.h index 658db94846..63ff72c598 100644 --- a/src/declarative/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickFlickablePrivate; class QQuickFlickableVisibleArea; class Q_DECLARATIVE_EXPORT QQuickFlickable : public QQuickItem diff --git a/src/declarative/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h similarity index 100% rename from src/declarative/items/qquickflickable_p_p.h rename to src/quick/items/qquickflickable_p_p.h diff --git a/src/declarative/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp similarity index 100% rename from src/declarative/items/qquickflipable.cpp rename to src/quick/items/qquickflipable.cpp diff --git a/src/declarative/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h similarity index 99% rename from src/declarative/items/qquickflipable_p.h rename to src/quick/items/qquickflipable_p.h index 698ec0fcb2..9a39b95fbd 100644 --- a/src/declarative/items/qquickflipable_p.h +++ b/src/quick/items/qquickflipable_p.h @@ -53,8 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickFlipablePrivate; class Q_AUTOTEST_EXPORT QQuickFlipable : public QQuickItem { diff --git a/src/declarative/items/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp similarity index 100% rename from src/declarative/items/qquickfocusscope.cpp rename to src/quick/items/qquickfocusscope.cpp diff --git a/src/declarative/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h similarity index 98% rename from src/declarative/items/qquickfocusscope_p.h rename to src/quick/items/qquickfocusscope_p.h index ff1a389f62..472aceed33 100644 --- a/src/declarative/items/qquickfocusscope_p.h +++ b/src/quick/items/qquickfocusscope_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class Q_AUTOTEST_EXPORT QQuickFocusScope : public QQuickItem { Q_OBJECT diff --git a/src/declarative/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp similarity index 100% rename from src/declarative/items/qquickgridview.cpp rename to src/quick/items/qquickgridview.cpp diff --git a/src/declarative/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h similarity index 99% rename from src/declarative/items/qquickgridview_p.h rename to src/quick/items/qquickgridview_p.h index b02c0a8350..729c6e433e 100644 --- a/src/declarative/items/qquickgridview_p.h +++ b/src/quick/items/qquickgridview_p.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) class QQuickVisualModel; class QQuickGridViewAttached; class QQuickGridViewPrivate; diff --git a/src/declarative/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp similarity index 99% rename from src/declarative/items/qquickimage.cpp rename to src/quick/items/qquickimage.cpp index 46b8ea0915..19a8ef1199 100644 --- a/src/declarative/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -42,9 +42,9 @@ #include "qquickimage_p.h" #include "qquickimage_p_p.h" -#include +#include -#include +#include #include #include diff --git a/src/declarative/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h similarity index 98% rename from src/declarative/items/qquickimage_p.h rename to src/quick/items/qquickimage_p.h index 0d1c8dcba3..36b43079b0 100644 --- a/src/declarative/items/qquickimage_p.h +++ b/src/quick/items/qquickimage_p.h @@ -44,14 +44,12 @@ #define QQUICKIMAGE_P_H #include "qquickimagebase_p.h" -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickImagePrivate; class Q_AUTOTEST_EXPORT QQuickImage : public QQuickImageBase { diff --git a/src/declarative/items/qquickimage_p_p.h b/src/quick/items/qquickimage_p_p.h similarity index 100% rename from src/declarative/items/qquickimage_p_p.h rename to src/quick/items/qquickimage_p_p.h diff --git a/src/declarative/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp similarity index 100% rename from src/declarative/items/qquickimagebase.cpp rename to src/quick/items/qquickimagebase.cpp diff --git a/src/declarative/items/qquickimagebase_p.h b/src/quick/items/qquickimagebase_p.h similarity index 100% rename from src/declarative/items/qquickimagebase_p.h rename to src/quick/items/qquickimagebase_p.h diff --git a/src/declarative/items/qquickimagebase_p_p.h b/src/quick/items/qquickimagebase_p_p.h similarity index 98% rename from src/declarative/items/qquickimagebase_p_p.h rename to src/quick/items/qquickimagebase_p_p.h index 2347a82e92..0045562ddc 100644 --- a/src/declarative/items/qquickimagebase_p_p.h +++ b/src/quick/items/qquickimagebase_p_p.h @@ -57,7 +57,7 @@ #include "qquickimplicitsizeitem_p_p.h" #include "qquickimagebase_p.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qquickimplicitsizeitem.cpp b/src/quick/items/qquickimplicitsizeitem.cpp similarity index 100% rename from src/declarative/items/qquickimplicitsizeitem.cpp rename to src/quick/items/qquickimplicitsizeitem.cpp diff --git a/src/declarative/items/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h similarity index 100% rename from src/declarative/items/qquickimplicitsizeitem_p.h rename to src/quick/items/qquickimplicitsizeitem_p.h diff --git a/src/declarative/items/qquickimplicitsizeitem_p_p.h b/src/quick/items/qquickimplicitsizeitem_p_p.h similarity index 100% rename from src/declarative/items/qquickimplicitsizeitem_p_p.h rename to src/quick/items/qquickimplicitsizeitem_p_p.h diff --git a/src/declarative/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp similarity index 99% rename from src/declarative/items/qquickitem.cpp rename to src/quick/items/qquickitem.cpp index 9c11196944..a9409ecdf4 100644 --- a/src/declarative/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -59,9 +59,9 @@ #include #include -#include +#include #include -#include +#include #include #include @@ -1575,6 +1575,8 @@ void QQuickItemPrivate::setLayoutMirror(bool mirror) \class QQuickItem \brief The QQuickItem class provides the most basic of all visual items in QML. + \inmodule QtQuick + All visual items in Qt Declarative inherit from QQuickItem. Although QQuickItem has no visual appearance, it defines all the properties that are common across visual items - such as the x and y position, the diff --git a/src/declarative/items/qquickitem.h b/src/quick/items/qquickitem.h similarity index 98% rename from src/declarative/items/qquickitem.h rename to src/quick/items/qquickitem.h index a3baecb9ea..6e7a909696 100644 --- a/src/declarative/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -43,6 +43,7 @@ #ifndef QQUICKITEM_H #define QQUICKITEM_H +#include #include #include @@ -55,8 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickItem; class QQuickTransformPrivate; class QQuickTransform : public QObject @@ -95,7 +94,7 @@ class QSGNode; class QSGTransformNode; class QSGTextureProvider; -class Q_DECLARATIVE_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatus +class Q_QUICK_EXPORT QQuickItem : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) @@ -408,7 +407,7 @@ public Q_SLOTS: Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickItem::Flags) #ifndef QT_NO_DEBUG_STREAM -QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QQuickItem *item); +QDebug Q_QUICK_EXPORT operator<<(QDebug debug, QQuickItem *item); #endif QT_END_NAMESPACE diff --git a/src/declarative/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h similarity index 99% rename from src/declarative/items/qquickitem_p.h rename to src/quick/items/qquickitem_p.h index 08ae7fac9b..a522a19a70 100644 --- a/src/declarative/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -62,11 +62,11 @@ #include "qquickcanvas_p.h" -#include +#include #include "qquickclipnode_p.h" #include -#include +#include #include #include #include @@ -133,7 +133,7 @@ class QQuickTransformPrivate : public QObjectPrivate QList items; }; -class Q_DECLARATIVE_EXPORT QQuickItemPrivate : public QObjectPrivate +class Q_QUICK_EXPORT QQuickItemPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQuickItem) diff --git a/src/declarative/items/qquickitemchangelistener_p.h b/src/quick/items/qquickitemchangelistener_p.h similarity index 100% rename from src/declarative/items/qquickitemchangelistener_p.h rename to src/quick/items/qquickitemchangelistener_p.h diff --git a/src/declarative/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp similarity index 98% rename from src/declarative/items/qquickitemsmodule.cpp rename to src/quick/items/qquickitemsmodule.cpp index 060d51e092..a9d8a193f0 100644 --- a/src/declarative/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -72,10 +72,10 @@ #include "qquickstateoperations_p.h" #include "qquickanimation_p.h" #include -#include +#include //#include -#include -#include +#include +#include #include "qquicksprite_p.h" #include "qquickspriteimage_p.h" #include "qquickdrag_p.h" diff --git a/src/declarative/items/qquickitemsmodule_p.h b/src/quick/items/qquickitemsmodule_p.h similarity index 98% rename from src/declarative/items/qquickitemsmodule_p.h rename to src/quick/items/qquickitemsmodule_p.h index d3682007d7..025a5fa0be 100644 --- a/src/declarative/items/qquickitemsmodule_p.h +++ b/src/quick/items/qquickitemsmodule_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickItemsModule { public: diff --git a/src/declarative/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp similarity index 100% rename from src/declarative/items/qquickitemview.cpp rename to src/quick/items/qquickitemview.cpp diff --git a/src/declarative/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h similarity index 99% rename from src/declarative/items/qquickitemview_p.h rename to src/quick/items/qquickitemview_p.h index b8e27e4741..2b0b31ccd5 100644 --- a/src/declarative/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeChangeSet; class QQuickItemViewPrivate; diff --git a/src/declarative/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h similarity index 99% rename from src/declarative/items/qquickitemview_p_p.h rename to src/quick/items/qquickitemview_p_p.h index 4db274e045..3b2c39bdeb 100644 --- a/src/declarative/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -52,8 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class FxViewItem { public: diff --git a/src/declarative/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp similarity index 100% rename from src/declarative/items/qquicklistview.cpp rename to src/quick/items/qquicklistview.cpp diff --git a/src/declarative/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h similarity index 99% rename from src/declarative/items/qquicklistview_p.h rename to src/quick/items/qquicklistview_p.h index 0266e23cd5..68746d8215 100644 --- a/src/declarative/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickListView; class QQuickListViewPrivate; class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject diff --git a/src/declarative/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp similarity index 100% rename from src/declarative/items/qquickloader.cpp rename to src/quick/items/qquickloader.cpp diff --git a/src/declarative/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h similarity index 99% rename from src/declarative/items/qquickloader_p.h rename to src/quick/items/qquickloader_p.h index 3dcab4c654..0416164932 100644 --- a/src/declarative/items/qquickloader_p.h +++ b/src/quick/items/qquickloader_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickLoaderPrivate; class Q_AUTOTEST_EXPORT QQuickLoader : public QQuickImplicitSizeItem { diff --git a/src/declarative/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h similarity index 100% rename from src/declarative/items/qquickloader_p_p.h rename to src/quick/items/qquickloader_p_p.h diff --git a/src/declarative/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp similarity index 100% rename from src/declarative/items/qquickmousearea.cpp rename to src/quick/items/qquickmousearea.cpp diff --git a/src/declarative/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h similarity index 98% rename from src/declarative/items/qquickmousearea_p.h rename to src/quick/items/qquickmousearea_p.h index b8fa7d5ce8..58da0468b8 100644 --- a/src/declarative/items/qquickmousearea_p.h +++ b/src/quick/items/qquickmousearea_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickDragAttached; class QQuickMouseEvent; class Q_AUTOTEST_EXPORT QQuickDrag : public QObject @@ -123,7 +121,7 @@ class Q_AUTOTEST_EXPORT QQuickDrag : public QObject class QQuickMouseAreaPrivate; // used in QtLocation -class Q_DECLARATIVE_EXPORT QQuickMouseArea : public QQuickItem +class Q_QUICK_EXPORT QQuickMouseArea : public QQuickItem { Q_OBJECT diff --git a/src/declarative/items/qquickmousearea_p_p.h b/src/quick/items/qquickmousearea_p_p.h similarity index 100% rename from src/declarative/items/qquickmousearea_p_p.h rename to src/quick/items/qquickmousearea_p_p.h diff --git a/src/declarative/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp similarity index 99% rename from src/declarative/items/qquickmultipointtoucharea.cpp rename to src/quick/items/qquickmultipointtoucharea.cpp index f7fdf97fb7..c94abc6c9d 100644 --- a/src/declarative/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquickmultipointtoucharea_p.h" -#include +#include #include #include #include diff --git a/src/declarative/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h similarity index 99% rename from src/declarative/items/qquickmultipointtoucharea_p.h rename to src/quick/items/qquickmultipointtoucharea_p.h index dac70453c5..aee18a376b 100644 --- a/src/declarative/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -54,8 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickMultiPointTouchArea; class Q_AUTOTEST_EXPORT QQuickTouchPoint : public QObject { diff --git a/src/declarative/items/qquickninepatchnode.cpp b/src/quick/items/qquickninepatchnode.cpp similarity index 100% rename from src/declarative/items/qquickninepatchnode.cpp rename to src/quick/items/qquickninepatchnode.cpp diff --git a/src/declarative/items/qquickninepatchnode_p.h b/src/quick/items/qquickninepatchnode_p.h similarity index 97% rename from src/declarative/items/qquickninepatchnode_p.h rename to src/quick/items/qquickninepatchnode_p.h index cdb0fd8e70..0cb1c87d54 100644 --- a/src/declarative/items/qquickninepatchnode_p.h +++ b/src/quick/items/qquickninepatchnode_p.h @@ -42,8 +42,8 @@ #ifndef QQUICKNINEPATCHNODE_H #define QQUICKNINEPATCHNODE_H -#include "qsgnode.h" -#include "qsgtexturematerial.h" +#include +#include #include "qquickborderimage_p.h" class TextureReference; diff --git a/src/declarative/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp similarity index 99% rename from src/declarative/items/qquickpainteditem.cpp rename to src/quick/items/qquickpainteditem.cpp index 4d96da2e1a..23ba777528 100644 --- a/src/declarative/items/qquickpainteditem.cpp +++ b/src/quick/items/qquickpainteditem.cpp @@ -42,8 +42,8 @@ #include "qquickpainteditem.h" #include -#include -#include +#include +#include #include #include @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \brief The QQuickPaintedItem class provides a way to use the QPainter API in the QML Scene Graph. - \inmodule QtDeclarative + \inmodule QtQuick The QQuickPaintedItem makes it possible to use the QPainter API with the QML Scene Graph. It sets up a textured rectangle in the Scene Graph and uses a QPainter to paint diff --git a/src/declarative/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h similarity index 97% rename from src/declarative/items/qquickpainteditem.h rename to src/quick/items/qquickpainteditem.h index b2da9e6c7a..939ad6303b 100644 --- a/src/declarative/items/qquickpainteditem.h +++ b/src/quick/items/qquickpainteditem.h @@ -42,7 +42,7 @@ #ifndef QQUICKPAINTEDITEM_P_H #define QQUICKPAINTEDITEM_P_H -#include +#include #include QT_BEGIN_HEADER @@ -50,7 +50,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QQuickPaintedItemPrivate; -class Q_DECLARATIVE_EXPORT QQuickPaintedItem : public QQuickItem +class Q_QUICK_EXPORT QQuickPaintedItem : public QQuickItem { Q_OBJECT Q_ENUMS(RenderTarget) diff --git a/src/declarative/items/qquickpainteditem_p.h b/src/quick/items/qquickpainteditem_p.h similarity index 100% rename from src/declarative/items/qquickpainteditem_p.h rename to src/quick/items/qquickpainteditem_p.h diff --git a/src/declarative/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp similarity index 99% rename from src/declarative/items/qquickpathview.cpp rename to src/quick/items/qquickpathview.cpp index f262562edf..0428dbe9cd 100644 --- a/src/declarative/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -43,7 +43,7 @@ #include "qquickpathview_p_p.h" #include "qquickcanvas.h" -#include +#include #include #include #include diff --git a/src/declarative/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h similarity index 99% rename from src/declarative/items/qquickpathview_p.h rename to src/quick/items/qquickpathview_p.h index ebc1587b09..17195b7f02 100644 --- a/src/declarative/items/qquickpathview_p.h +++ b/src/quick/items/qquickpathview_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeChangeSet; class QQuickPathViewPrivate; diff --git a/src/declarative/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h similarity index 100% rename from src/declarative/items/qquickpathview_p_p.h rename to src/quick/items/qquickpathview_p_p.h diff --git a/src/declarative/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp similarity index 100% rename from src/declarative/items/qquickpincharea.cpp rename to src/quick/items/qquickpincharea.cpp diff --git a/src/declarative/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h similarity index 99% rename from src/declarative/items/qquickpincharea_p.h rename to src/quick/items/qquickpincharea_p.h index c98a1fdd9e..0f3eda0f98 100644 --- a/src/declarative/items/qquickpincharea_p.h +++ b/src/quick/items/qquickpincharea_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class Q_AUTOTEST_EXPORT QQuickPinch : public QObject { Q_OBJECT diff --git a/src/declarative/items/qquickpincharea_p_p.h b/src/quick/items/qquickpincharea_p_p.h similarity index 100% rename from src/declarative/items/qquickpincharea_p_p.h rename to src/quick/items/qquickpincharea_p_p.h diff --git a/src/declarative/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp similarity index 99% rename from src/declarative/items/qquickpositioners.cpp rename to src/quick/items/qquickpositioners.cpp index 08fa4b1724..2643baa804 100644 --- a/src/declarative/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -47,10 +47,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h similarity index 98% rename from src/declarative/items/qquickpositioners_p.h rename to src/quick/items/qquickpositioners_p.h index b8e8879205..72c87a94b7 100644 --- a/src/declarative/items/qquickpositioners_p.h +++ b/src/quick/items/qquickpositioners_p.h @@ -45,7 +45,7 @@ #include "qquickimplicitsizeitem_p.h" -#include +#include #include #include @@ -55,8 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickBasePositionerPrivate; class QQuickPositionerAttached : public QObject @@ -90,7 +88,7 @@ class QQuickPositionerAttached : public QObject bool m_isLastItem; }; -class Q_DECLARATIVE_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeItem +class Q_QUICK_PRIVATE_EXPORT QQuickBasePositioner : public QQuickImplicitSizeItem { Q_OBJECT diff --git a/src/declarative/items/qquickpositioners_p_p.h b/src/quick/items/qquickpositioners_p_p.h similarity index 99% rename from src/declarative/items/qquickpositioners_p_p.h rename to src/quick/items/qquickpositioners_p_p.h index 86c6c74ba6..e7a5f8b473 100644 --- a/src/declarative/items/qquickpositioners_p_p.h +++ b/src/quick/items/qquickpositioners_p_p.h @@ -57,7 +57,7 @@ #include "qquickpositioners_p.h" #include "qquickimplicitsizeitem_p_p.h" -#include +#include #include #include diff --git a/src/declarative/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp similarity index 99% rename from src/declarative/items/qquickrectangle.cpp rename to src/quick/items/qquickrectangle.cpp index c3cbaaa00e..388815941a 100644 --- a/src/declarative/items/qquickrectangle.cpp +++ b/src/quick/items/qquickrectangle.cpp @@ -42,7 +42,7 @@ #include "qquickrectangle_p.h" #include "qquickrectangle_p_p.h" -#include +#include #include #include diff --git a/src/declarative/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h similarity index 95% rename from src/declarative/items/qquickrectangle_p.h rename to src/quick/items/qquickrectangle_p.h index 838b944c62..540eb33739 100644 --- a/src/declarative/items/qquickrectangle_p.h +++ b/src/quick/items/qquickrectangle_p.h @@ -47,14 +47,13 @@ #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) -class Q_DECLARATIVE_PRIVATE_EXPORT QQuickPen : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickPen : public QObject { Q_OBJECT @@ -138,7 +137,7 @@ class Q_AUTOTEST_EXPORT QQuickGradient : public QObject }; class QQuickRectanglePrivate; -class Q_DECLARATIVE_PRIVATE_EXPORT QQuickRectangle : public QQuickItem +class Q_QUICK_PRIVATE_EXPORT QQuickRectangle : public QQuickItem { Q_OBJECT diff --git a/src/declarative/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h similarity index 100% rename from src/declarative/items/qquickrectangle_p_p.h rename to src/quick/items/qquickrectangle_p_p.h diff --git a/src/declarative/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp similarity index 100% rename from src/declarative/items/qquickrepeater.cpp rename to src/quick/items/qquickrepeater.cpp diff --git a/src/declarative/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h similarity index 99% rename from src/declarative/items/qquickrepeater_p.h rename to src/quick/items/qquickrepeater_p.h index 5b90d74e65..19beaec422 100644 --- a/src/declarative/items/qquickrepeater_p.h +++ b/src/quick/items/qquickrepeater_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeChangeSet; class QQuickRepeaterPrivate; diff --git a/src/declarative/items/qquickrepeater_p_p.h b/src/quick/items/qquickrepeater_p_p.h similarity index 100% rename from src/declarative/items/qquickrepeater_p_p.h rename to src/quick/items/qquickrepeater_p_p.h diff --git a/src/declarative/items/qquickscalegrid.cpp b/src/quick/items/qquickscalegrid.cpp similarity index 100% rename from src/declarative/items/qquickscalegrid.cpp rename to src/quick/items/qquickscalegrid.cpp diff --git a/src/declarative/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h similarity index 93% rename from src/declarative/items/qquickscalegrid_p_p.h rename to src/quick/items/qquickscalegrid_p_p.h index 8d93c3b1c9..2ce45f7347 100644 --- a/src/declarative/items/qquickscalegrid_p_p.h +++ b/src/quick/items/qquickscalegrid_p_p.h @@ -48,16 +48,14 @@ #include #include -#include -#include +#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - -class Q_DECLARATIVE_PRIVATE_EXPORT QQuickScaleGrid : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickScaleGrid : public QObject { Q_OBJECT Q_ENUMS(TileRule) @@ -95,7 +93,7 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QQuickScaleGrid : public QObject int _bottom; }; -class Q_DECLARATIVE_PRIVATE_EXPORT QQuickGridScaledImage +class Q_QUICK_PRIVATE_EXPORT QQuickGridScaledImage { public: QQuickGridScaledImage(); diff --git a/src/declarative/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp similarity index 99% rename from src/declarative/items/qquickshadereffect.cpp rename to src/quick/items/qquickshadereffect.cpp index bdef980440..7572a0cf0d 100644 --- a/src/declarative/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -42,11 +42,11 @@ #include #include -#include "qsgmaterial.h" +#include #include "qquickitem_p.h" -#include -#include +#include +#include #include "qquickcanvas.h" #include "qquickimage_p.h" diff --git a/src/declarative/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h similarity index 98% rename from src/declarative/items/qquickshadereffect_p.h rename to src/quick/items/qquickshadereffect_p.h index 1910f43195..97444fb2f5 100644 --- a/src/declarative/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -42,9 +42,9 @@ #ifndef QQUICKSHADEREFFECT_P_H #define QQUICKSHADEREFFECT_P_H -#include "qquickitem.h" +#include -#include "qsgmaterial.h" +#include #include #include #include "qquickshadereffectmesh_p.h" @@ -55,8 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - const char *qtPositionAttributeName(); const char *qtTexCoordAttributeName(); diff --git a/src/declarative/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp similarity index 99% rename from src/declarative/items/qquickshadereffectmesh.cpp rename to src/quick/items/qquickshadereffectmesh.cpp index 7709bed614..3154ac7cfd 100644 --- a/src/declarative/items/qquickshadereffectmesh.cpp +++ b/src/quick/items/qquickshadereffectmesh.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquickshadereffectmesh_p.h" -#include "qsggeometry.h" +#include #include "qquickshadereffect_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h similarity index 97% rename from src/declarative/items/qquickshadereffectmesh_p.h rename to src/quick/items/qquickshadereffectmesh_p.h index 40549f73a8..1671fd53f9 100644 --- a/src/declarative/items/qquickshadereffectmesh_p.h +++ b/src/quick/items/qquickshadereffectmesh_p.h @@ -41,6 +41,7 @@ #include "qdeclarativeparserstatus.h" +#include #include #include #include @@ -54,12 +55,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGGeometry; class QRectF; -class Q_DECLARATIVE_EXPORT QQuickShaderEffectMesh : public QObject +class Q_QUICK_EXPORT QQuickShaderEffectMesh : public QObject { Q_OBJECT public: diff --git a/src/declarative/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp similarity index 99% rename from src/declarative/items/qquickshadereffectnode.cpp rename to src/quick/items/qquickshadereffectnode.cpp index 43c891e497..02b49b94c5 100644 --- a/src/declarative/items/qquickshadereffectnode.cpp +++ b/src/quick/items/qquickshadereffectnode.cpp @@ -42,8 +42,8 @@ #include #include "qquickshadereffectmesh_p.h" -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h similarity index 97% rename from src/declarative/items/qquickshadereffectnode_p.h rename to src/quick/items/qquickshadereffectnode_p.h index 50213ff396..abcd4a9b8e 100644 --- a/src/declarative/items/qquickshadereffectnode_p.h +++ b/src/quick/items/qquickshadereffectnode_p.h @@ -42,10 +42,10 @@ #ifndef QQUICKSHADEREFFECTNODE_P_H #define QQUICKSHADEREFFECTNODE_P_H -#include "qsgnode.h" -#include "qsgmaterial.h" -#include -#include +#include +#include +#include +#include #include #include @@ -54,8 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - struct QQuickShaderEffectMaterialKey { QByteArray vertexCode; QByteArray fragmentCode; diff --git a/src/declarative/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp similarity index 99% rename from src/declarative/items/qquickshadereffectsource.cpp rename to src/quick/items/qquickshadereffectsource.cpp index 952f240cd3..e8be7bde85 100644 --- a/src/declarative/items/qquickshadereffectsource.cpp +++ b/src/quick/items/qquickshadereffectsource.cpp @@ -44,11 +44,11 @@ #include "qquickitem_p.h" #include "qquickcanvas_p.h" #include -#include +#include #include "qopenglframebufferobject.h" #include "qmath.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h similarity index 96% rename from src/declarative/items/qquickshadereffectsource_p.h rename to src/quick/items/qquickshadereffectsource_p.h index fee361c27c..b648cb5614 100644 --- a/src/declarative/items/qquickshadereffectsource_p.h +++ b/src/quick/items/qquickshadereffectsource_p.h @@ -43,9 +43,9 @@ #define QQUICKSHADEREFFECTSOURCE_P_H #include "qquickitem.h" -#include +#include #include -#include +#include #include #include @@ -59,8 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGNode; class UpdatePaintNodeData; class QOpenGLFramebufferObject; @@ -78,7 +76,7 @@ private Q_SLOTS: void markDirtyTexture(); }; -class Q_DECLARATIVE_EXPORT QQuickShaderEffectTexture : public QSGDynamicTexture +class Q_QUICK_EXPORT QQuickShaderEffectTexture : public QSGDynamicTexture { Q_OBJECT public: @@ -154,7 +152,7 @@ public Q_SLOTS: uint m_grab : 1; }; -class Q_DECLARATIVE_EXPORT QQuickShaderEffectSource : public QQuickItem, public QQuickItemChangeListener +class Q_QUICK_EXPORT QQuickShaderEffectSource : public QQuickItem, public QQuickItemChangeListener { Q_OBJECT Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged) diff --git a/src/declarative/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp similarity index 100% rename from src/declarative/items/qquicksprite.cpp rename to src/quick/items/qquicksprite.cpp diff --git a/src/declarative/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h similarity index 99% rename from src/declarative/items/qquicksprite_p.h rename to src/quick/items/qquicksprite_p.h index e7f3bbce80..a3921ed96a 100644 --- a/src/declarative/items/qquicksprite_p.h +++ b/src/quick/items/qquicksprite_p.h @@ -52,9 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickSprite : public QQuickStochasticState { Q_OBJECT diff --git a/src/declarative/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp similarity index 100% rename from src/declarative/items/qquickspriteengine.cpp rename to src/quick/items/qquickspriteengine.cpp diff --git a/src/declarative/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h similarity index 99% rename from src/declarative/items/qquickspriteengine_p.h rename to src/quick/items/qquickspriteengine_p.h index 1040140a28..283ee17c96 100644 --- a/src/declarative/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -55,8 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickSprite; class Q_AUTOTEST_EXPORT QQuickStochasticState : public QObject //For internal use { diff --git a/src/declarative/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp similarity index 98% rename from src/declarative/items/qquickspriteimage.cpp rename to src/quick/items/qquickspriteimage.cpp index a18d0f95c7..1da46f2ae8 100644 --- a/src/declarative/items/qquickspriteimage.cpp +++ b/src/quick/items/qquickspriteimage.cpp @@ -42,13 +42,13 @@ #include "qquickspriteimage_p.h" #include "qquicksprite_p.h" #include "qquickspriteengine_p.h" -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/declarative/items/qquickspriteimage_p.h b/src/quick/items/qquickspriteimage_p.h similarity index 98% rename from src/declarative/items/qquickspriteimage_p.h rename to src/quick/items/qquickspriteimage_p.h index 39384cedca..fb5c115961 100644 --- a/src/declarative/items/qquickspriteimage_p.h +++ b/src/quick/items/qquickspriteimage_p.h @@ -42,15 +42,13 @@ #ifndef QQUICKSPRITEIMAGE_P_H #define QQUICKSPRITEIMAGE_P_H -#include +#include #include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGContext; class QQuickSprite; class QQuickSpriteEngine; diff --git a/src/declarative/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp similarity index 100% rename from src/declarative/items/qquickstateoperations.cpp rename to src/quick/items/qquickstateoperations.cpp diff --git a/src/declarative/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h similarity index 99% rename from src/declarative/items/qquickstateoperations_p.h rename to src/quick/items/qquickstateoperations_p.h index 7844c6d7dd..3454ac1e11 100644 --- a/src/declarative/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_p.h @@ -46,7 +46,7 @@ #include "qquickitem.h" #include "qquickanchors_p.h" -#include +#include #include @@ -54,8 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickParentChangePrivate; class Q_AUTOTEST_EXPORT QQuickParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent { diff --git a/src/declarative/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp similarity index 99% rename from src/declarative/items/qquicktext.cpp rename to src/quick/items/qquicktext.cpp index 630b466d80..d01512740d 100644 --- a/src/declarative/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -42,11 +42,11 @@ #include "qquicktext_p.h" #include "qquicktext_p_p.h" -#include +#include #include #include "qquicktextnode_p.h" #include "qquickimage_p_p.h" -#include +#include #include #include @@ -58,7 +58,7 @@ #include #include -#include +#include #include #include diff --git a/src/declarative/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h similarity index 98% rename from src/declarative/items/qquicktext_p.h rename to src/quick/items/qquicktext_p.h index be77f2eb45..3a9f691c53 100644 --- a/src/declarative/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -45,7 +45,7 @@ #include "qquickimplicitsizeitem_p.h" -#include +#include #include @@ -53,10 +53,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) class QQuickTextPrivate; class QQuickTextLine; -class Q_DECLARATIVE_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem +class Q_QUICK_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem { Q_OBJECT Q_ENUMS(HAlignment) diff --git a/src/declarative/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h similarity index 100% rename from src/declarative/items/qquicktext_p_p.h rename to src/quick/items/qquicktext_p_p.h diff --git a/src/declarative/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp similarity index 99% rename from src/declarative/items/qquicktextedit.cpp rename to src/quick/items/qquicktextedit.cpp index b40b5c09a1..c43a5be14c 100644 --- a/src/declarative/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -44,7 +44,7 @@ #include "qquickevents_p_p.h" #include "qquickcanvas.h" #include "qquicktextnode_p.h" -#include "qsgsimplerectnode.h" +#include #include #include @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h similarity index 99% rename from src/declarative/items/qquicktextedit_p.h rename to src/quick/items/qquicktextedit_p.h index 25988959f6..e234d6ef95 100644 --- a/src/declarative/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickTextEditPrivate; class Q_AUTOTEST_EXPORT QQuickTextEdit : public QQuickImplicitSizeItem { diff --git a/src/declarative/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h similarity index 100% rename from src/declarative/items/qquicktextedit_p_p.h rename to src/quick/items/qquicktextedit_p_p.h diff --git a/src/declarative/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp similarity index 99% rename from src/declarative/items/qquicktextinput.cpp rename to src/quick/items/qquicktextinput.cpp index f3cdc8835a..e9caaf2ee8 100644 --- a/src/declarative/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -49,7 +49,7 @@ #include #include #include "qquicktextnode_p.h" -#include +#include #include #include diff --git a/src/declarative/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h similarity index 99% rename from src/declarative/items/qquicktextinput_p.h rename to src/quick/items/qquicktextinput_p.h index 493788ec84..3ea86477a1 100644 --- a/src/declarative/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -50,8 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickTextInputPrivate; class QValidator; class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem diff --git a/src/declarative/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h similarity index 100% rename from src/declarative/items/qquicktextinput_p_p.h rename to src/quick/items/qquicktextinput_p_p.h diff --git a/src/declarative/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp similarity index 99% rename from src/declarative/items/qquicktextnode.cpp rename to src/quick/items/qquicktextnode.cpp index 56c3b54cd7..bfb3591d04 100644 --- a/src/declarative/items/qquicktextnode.cpp +++ b/src/quick/items/qquicktextnode.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include "qquicktextnode_p.h" -#include "qsgsimplerectnode.h" +#include #include #include -#include +#include #include #include diff --git a/src/declarative/items/qquicktextnode_p.h b/src/quick/items/qquicktextnode_p.h similarity index 99% rename from src/declarative/items/qquicktextnode_p.h rename to src/quick/items/qquicktextnode_p.h index 16e92e34f3..a519322160 100644 --- a/src/declarative/items/qquicktextnode_p.h +++ b/src/quick/items/qquicktextnode_p.h @@ -42,7 +42,7 @@ #ifndef QQUICKTEXTNODE_P_H #define QQUICKTEXTNODE_P_H -#include +#include #include "qquicktext_p.h" #include diff --git a/src/declarative/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp similarity index 100% rename from src/declarative/items/qquicktranslate.cpp rename to src/quick/items/qquicktranslate.cpp diff --git a/src/declarative/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h similarity index 99% rename from src/declarative/items/qquicktranslate_p.h rename to src/quick/items/qquicktranslate_p.h index 6c2333df34..ccfbb4c4e3 100644 --- a/src/declarative/items/qquicktranslate_p.h +++ b/src/quick/items/qquicktranslate_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickTranslatePrivate; class Q_AUTOTEST_EXPORT QQuickTranslate : public QQuickTransform { diff --git a/src/declarative/items/qquickview.cpp b/src/quick/items/qquickview.cpp similarity index 99% rename from src/declarative/items/qquickview.cpp rename to src/quick/items/qquickview.cpp index 9d431c865a..8c7db60195 100644 --- a/src/declarative/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -116,6 +116,8 @@ void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF \since QtQuick 2.0 \brief The QQuickView class provides a window for displaying a Qt Quick user interface. + \inmodule QtQuick + This is a convenience subclass of QQuickCanvas which will automatically load and display a QML scene when given the URL of the main source file. Alternatively, you can instantiate your own objects using QDeclarativeComponent and place them in a manually setup QQuickCanvas. diff --git a/src/declarative/items/qquickview.h b/src/quick/items/qquickview.h similarity index 97% rename from src/declarative/items/qquickview.h rename to src/quick/items/qquickview.h index 8321655d63..3c637689d3 100644 --- a/src/declarative/items/qquickview.h +++ b/src/quick/items/qquickview.h @@ -43,7 +43,7 @@ #ifndef QQUICKVIEW_H #define QQUICKVIEW_H -#include +#include #include #include @@ -51,15 +51,13 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeEngine; class QDeclarativeContext; class QDeclarativeError; class QQuickItem; class QQuickViewPrivate; -class Q_DECLARATIVE_EXPORT QQuickView : public QQuickCanvas +class Q_QUICK_EXPORT QQuickView : public QQuickCanvas { Q_OBJECT Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode) diff --git a/src/declarative/items/qquickview_p.h b/src/quick/items/qquickview_p.h similarity index 99% rename from src/declarative/items/qquickview_p.h rename to src/quick/items/qquickview_p.h index 8c835268f5..dbc02be094 100644 --- a/src/declarative/items/qquickview_p.h +++ b/src/quick/items/qquickview_p.h @@ -57,8 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeContext; class QDeclarativeError; class QQuickItem; diff --git a/src/declarative/items/qquickvisualadaptormodel.cpp b/src/quick/items/qquickvisualadaptormodel.cpp similarity index 100% rename from src/declarative/items/qquickvisualadaptormodel.cpp rename to src/quick/items/qquickvisualadaptormodel.cpp diff --git a/src/declarative/items/qquickvisualadaptormodel_p.h b/src/quick/items/qquickvisualadaptormodel_p.h similarity index 100% rename from src/declarative/items/qquickvisualadaptormodel_p.h rename to src/quick/items/qquickvisualadaptormodel_p.h diff --git a/src/declarative/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp similarity index 100% rename from src/declarative/items/qquickvisualdatamodel.cpp rename to src/quick/items/qquickvisualdatamodel.cpp diff --git a/src/declarative/items/qquickvisualdatamodel_p.h b/src/quick/items/qquickvisualdatamodel_p.h similarity index 98% rename from src/declarative/items/qquickvisualdatamodel_p.h rename to src/quick/items/qquickvisualdatamodel_p.h index a5a384f67b..9e5e3a4511 100644 --- a/src/declarative/items/qquickvisualdatamodel_p.h +++ b/src/quick/items/qquickvisualdatamodel_p.h @@ -58,9 +58,6 @@ Q_DECLARE_METATYPE(QModelIndex) QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QDeclarativeChangeSet; class QDeclarativeComponent; class QDeclarativePackage; @@ -70,7 +67,7 @@ class QQuickVisualDataModelAttached; class QQuickVisualDataModelPrivate; -class Q_DECLARATIVE_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QDeclarativeParserStatus +class Q_QUICK_EXPORT QQuickVisualDataModel : public QQuickVisualModel, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QQuickVisualDataModel) diff --git a/src/declarative/items/qquickvisualitemmodel.cpp b/src/quick/items/qquickvisualitemmodel.cpp similarity index 100% rename from src/declarative/items/qquickvisualitemmodel.cpp rename to src/quick/items/qquickvisualitemmodel.cpp diff --git a/src/declarative/items/qquickvisualitemmodel_p.h b/src/quick/items/qquickvisualitemmodel_p.h similarity index 96% rename from src/declarative/items/qquickvisualitemmodel_p.h rename to src/quick/items/qquickvisualitemmodel_p.h index 3d9610abe9..c00f841572 100644 --- a/src/declarative/items/qquickvisualitemmodel_p.h +++ b/src/quick/items/qquickvisualitemmodel_p.h @@ -43,6 +43,7 @@ #ifndef QQUICKVISUALITEMMODEL_P_H #define QQUICKVISUALITEMMODEL_P_H +#include #include #include @@ -50,12 +51,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickItem; class QDeclarativeChangeSet; -class Q_DECLARATIVE_EXPORT QQuickVisualModel : public QObject +class Q_QUICK_EXPORT QQuickVisualModel : public QObject { Q_OBJECT @@ -93,7 +92,7 @@ class Q_DECLARATIVE_EXPORT QQuickVisualModel : public QObject class QQuickVisualItemModelAttached; class QQuickVisualItemModelPrivate; -class Q_DECLARATIVE_EXPORT QQuickVisualItemModel : public QQuickVisualModel +class Q_QUICK_EXPORT QQuickVisualItemModel : public QQuickVisualModel { Q_OBJECT Q_DECLARE_PRIVATE(QQuickVisualItemModel) diff --git a/src/declarative/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp similarity index 98% rename from src/declarative/items/qquickwindowmodule.cpp rename to src/quick/items/qquickwindowmodule.cpp index 7a7f28cb43..726ea055d8 100644 --- a/src/declarative/items/qquickwindowmodule.cpp +++ b/src/quick/items/qquickwindowmodule.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquickwindowmodule_p.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h similarity index 100% rename from src/declarative/items/qquickwindowmodule_p.h rename to src/quick/items/qquickwindowmodule_p.h diff --git a/src/declarative/items/syncexcludes b/src/quick/items/syncexcludes similarity index 100% rename from src/declarative/items/syncexcludes rename to src/quick/items/syncexcludes diff --git a/src/declarative/particles/particleresources/noise.png b/src/quick/particles/particleresources/noise.png similarity index 100% rename from src/declarative/particles/particleresources/noise.png rename to src/quick/particles/particleresources/noise.png diff --git a/src/declarative/particles/particles.pri b/src/quick/particles/particles.pri similarity index 100% rename from src/declarative/particles/particles.pri rename to src/quick/particles/particles.pri diff --git a/src/declarative/particles/particles.qrc b/src/quick/particles/particles.qrc similarity index 100% rename from src/declarative/particles/particles.qrc rename to src/quick/particles/particles.qrc diff --git a/src/declarative/particles/qquickage.cpp b/src/quick/particles/qquickage.cpp similarity index 100% rename from src/declarative/particles/qquickage.cpp rename to src/quick/particles/qquickage.cpp diff --git a/src/declarative/particles/qquickage_p.h b/src/quick/particles/qquickage_p.h similarity index 99% rename from src/declarative/particles/qquickage_p.h rename to src/quick/particles/qquickage_p.h index 0adbddabe9..b3fd3c65f4 100644 --- a/src/declarative/particles/qquickage_p.h +++ b/src/quick/particles/qquickage_p.h @@ -47,9 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickAgeAffector : public QQuickParticleAffector { Q_OBJECT diff --git a/src/declarative/particles/qquickangledirection.cpp b/src/quick/particles/qquickangledirection.cpp similarity index 100% rename from src/declarative/particles/qquickangledirection.cpp rename to src/quick/particles/qquickangledirection.cpp diff --git a/src/declarative/particles/qquickangledirection_p.h b/src/quick/particles/qquickangledirection_p.h similarity index 99% rename from src/declarative/particles/qquickangledirection_p.h rename to src/quick/particles/qquickangledirection_p.h index 7baf1a6c60..c0de933c00 100644 --- a/src/declarative/particles/qquickangledirection_p.h +++ b/src/quick/particles/qquickangledirection_p.h @@ -46,8 +46,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickAngleDirection : public QQuickDirection { Q_OBJECT diff --git a/src/declarative/particles/qquickcumulativedirection.cpp b/src/quick/particles/qquickcumulativedirection.cpp similarity index 100% rename from src/declarative/particles/qquickcumulativedirection.cpp rename to src/quick/particles/qquickcumulativedirection.cpp diff --git a/src/declarative/particles/qquickcumulativedirection_p.h b/src/quick/particles/qquickcumulativedirection_p.h similarity index 99% rename from src/declarative/particles/qquickcumulativedirection_p.h rename to src/quick/particles/qquickcumulativedirection_p.h index af657821c2..cae491cafe 100644 --- a/src/declarative/particles/qquickcumulativedirection_p.h +++ b/src/quick/particles/qquickcumulativedirection_p.h @@ -47,8 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickCumulativeDirection : public QQuickDirection { Q_OBJECT diff --git a/src/declarative/particles/qquickcustomaffector.cpp b/src/quick/particles/qquickcustomaffector.cpp similarity index 100% rename from src/declarative/particles/qquickcustomaffector.cpp rename to src/quick/particles/qquickcustomaffector.cpp diff --git a/src/declarative/particles/qquickcustomaffector_p.h b/src/quick/particles/qquickcustomaffector_p.h similarity index 99% rename from src/declarative/particles/qquickcustomaffector_p.h rename to src/quick/particles/qquickcustomaffector_p.h index e347107f50..740b0a6773 100644 --- a/src/declarative/particles/qquickcustomaffector_p.h +++ b/src/quick/particles/qquickcustomaffector_p.h @@ -52,8 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickCustomAffector : public QQuickParticleAffector { Q_OBJECT diff --git a/src/declarative/particles/qquickcustomparticle.cpp b/src/quick/particles/qquickcustomparticle.cpp similarity index 99% rename from src/declarative/particles/qquickcustomparticle.cpp rename to src/quick/particles/qquickcustomparticle.cpp index 153dd273b6..e6f50c0ff6 100644 --- a/src/declarative/particles/qquickcustomparticle.cpp +++ b/src/quick/particles/qquickcustomparticle.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquickcustomparticle_p.h" -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/particles/qquickcustomparticle_p.h b/src/quick/particles/qquickcustomparticle_p.h similarity index 99% rename from src/declarative/particles/qquickcustomparticle_p.h rename to src/quick/particles/qquickcustomparticle_p.h index b3cf6d3e42..583e61fa39 100644 --- a/src/declarative/particles/qquickcustomparticle_p.h +++ b/src/quick/particles/qquickcustomparticle_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGNode; struct PlainVertices; diff --git a/src/declarative/particles/qquickdirection.cpp b/src/quick/particles/qquickdirection.cpp similarity index 100% rename from src/declarative/particles/qquickdirection.cpp rename to src/quick/particles/qquickdirection.cpp diff --git a/src/declarative/particles/qquickdirection_p.h b/src/quick/particles/qquickdirection_p.h similarity index 98% rename from src/declarative/particles/qquickdirection_p.h rename to src/quick/particles/qquickdirection_p.h index ac2ecdf9c1..ecfb84d90f 100644 --- a/src/declarative/particles/qquickdirection_p.h +++ b/src/quick/particles/qquickdirection_p.h @@ -49,9 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickDirection : public QObject { Q_OBJECT diff --git a/src/declarative/particles/qquickellipseextruder.cpp b/src/quick/particles/qquickellipseextruder.cpp similarity index 100% rename from src/declarative/particles/qquickellipseextruder.cpp rename to src/quick/particles/qquickellipseextruder.cpp diff --git a/src/declarative/particles/qquickellipseextruder_p.h b/src/quick/particles/qquickellipseextruder_p.h similarity index 99% rename from src/declarative/particles/qquickellipseextruder_p.h rename to src/quick/particles/qquickellipseextruder_p.h index 08e7e73d18..77c117a3d5 100644 --- a/src/declarative/particles/qquickellipseextruder_p.h +++ b/src/quick/particles/qquickellipseextruder_p.h @@ -47,9 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickEllipseExtruder : public QQuickParticleExtruder { Q_OBJECT diff --git a/src/declarative/particles/qquickfriction.cpp b/src/quick/particles/qquickfriction.cpp similarity index 100% rename from src/declarative/particles/qquickfriction.cpp rename to src/quick/particles/qquickfriction.cpp diff --git a/src/declarative/particles/qquickfriction_p.h b/src/quick/particles/qquickfriction_p.h similarity index 99% rename from src/declarative/particles/qquickfriction_p.h rename to src/quick/particles/qquickfriction_p.h index c2f227692c..0eaed34783 100644 --- a/src/declarative/particles/qquickfriction_p.h +++ b/src/quick/particles/qquickfriction_p.h @@ -47,9 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickFrictionAffector : public QQuickParticleAffector { Q_OBJECT diff --git a/src/declarative/particles/qquickgravity.cpp b/src/quick/particles/qquickgravity.cpp similarity index 100% rename from src/declarative/particles/qquickgravity.cpp rename to src/quick/particles/qquickgravity.cpp diff --git a/src/declarative/particles/qquickgravity_p.h b/src/quick/particles/qquickgravity_p.h similarity index 99% rename from src/declarative/particles/qquickgravity_p.h rename to src/quick/particles/qquickgravity_p.h index 65f8e5a19d..a9faf43349 100644 --- a/src/declarative/particles/qquickgravity_p.h +++ b/src/quick/particles/qquickgravity_p.h @@ -47,9 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickGravityAffector : public QQuickParticleAffector { Q_OBJECT diff --git a/src/declarative/particles/qquickgroupgoal.cpp b/src/quick/particles/qquickgroupgoal.cpp similarity index 100% rename from src/declarative/particles/qquickgroupgoal.cpp rename to src/quick/particles/qquickgroupgoal.cpp diff --git a/src/declarative/particles/qquickgroupgoal_p.h b/src/quick/particles/qquickgroupgoal_p.h similarity index 99% rename from src/declarative/particles/qquickgroupgoal_p.h rename to src/quick/particles/qquickgroupgoal_p.h index 51ce1ff24e..a24d89dfb5 100644 --- a/src/declarative/particles/qquickgroupgoal_p.h +++ b/src/quick/particles/qquickgroupgoal_p.h @@ -47,8 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickStochasticEngine; class QQuickGroupGoalAffector : public QQuickParticleAffector diff --git a/src/declarative/particles/qquickimageparticle.cpp b/src/quick/particles/qquickimageparticle.cpp similarity index 99% rename from src/declarative/particles/qquickimageparticle.cpp rename to src/quick/particles/qquickimageparticle.cpp index 5f31440441..3453dd6ed3 100644 --- a/src/declarative/particles/qquickimageparticle.cpp +++ b/src/quick/particles/qquickimageparticle.cpp @@ -39,19 +39,20 @@ ** ****************************************************************************/ -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include "qquickimageparticle_p.h" #include "qquickparticleemitter_p.h" #include #include #include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE //###Switch to define later, for now user-friendly (no compilation) debugging is worth it diff --git a/src/declarative/particles/qquickimageparticle_p.h b/src/quick/particles/qquickimageparticle_p.h similarity index 99% rename from src/declarative/particles/qquickimageparticle_p.h rename to src/quick/particles/qquickimageparticle_p.h index c7da7cfce6..61c24ed836 100644 --- a/src/declarative/particles/qquickimageparticle_p.h +++ b/src/quick/particles/qquickimageparticle_p.h @@ -44,15 +44,13 @@ #include "qquickparticlepainter_p.h" #include "qquickdirection_p.h" #include -#include +#include #include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class ImageMaterialData; class QSGGeometryNode; diff --git a/src/declarative/particles/qquickitemparticle.cpp b/src/quick/particles/qquickitemparticle.cpp similarity index 99% rename from src/declarative/particles/qquickitemparticle.cpp rename to src/quick/particles/qquickitemparticle.cpp index 8b39ac3abd..14ca085469 100644 --- a/src/declarative/particles/qquickitemparticle.cpp +++ b/src/quick/particles/qquickitemparticle.cpp @@ -41,7 +41,7 @@ #include "qquickitemparticle_p.h" #include -#include +#include #include #include #include diff --git a/src/declarative/particles/qquickitemparticle_p.h b/src/quick/particles/qquickitemparticle_p.h similarity index 99% rename from src/declarative/particles/qquickitemparticle_p.h rename to src/quick/particles/qquickitemparticle_p.h index 2e92b9c9ae..33d2bcfb4b 100644 --- a/src/declarative/particles/qquickitemparticle_p.h +++ b/src/quick/particles/qquickitemparticle_p.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) class QQuickVisualDataModel; class QQuickItemParticleAttached; diff --git a/src/declarative/particles/qquicklineextruder.cpp b/src/quick/particles/qquicklineextruder.cpp similarity index 100% rename from src/declarative/particles/qquicklineextruder.cpp rename to src/quick/particles/qquicklineextruder.cpp diff --git a/src/declarative/particles/qquicklineextruder_p.h b/src/quick/particles/qquicklineextruder_p.h similarity index 100% rename from src/declarative/particles/qquicklineextruder_p.h rename to src/quick/particles/qquicklineextruder_p.h diff --git a/src/declarative/particles/qquickmaskextruder.cpp b/src/quick/particles/qquickmaskextruder.cpp similarity index 100% rename from src/declarative/particles/qquickmaskextruder.cpp rename to src/quick/particles/qquickmaskextruder.cpp diff --git a/src/declarative/particles/qquickmaskextruder_p.h b/src/quick/particles/qquickmaskextruder_p.h similarity index 99% rename from src/declarative/particles/qquickmaskextruder_p.h rename to src/quick/particles/qquickmaskextruder_p.h index 9430321e50..180bcf26e2 100644 --- a/src/declarative/particles/qquickmaskextruder_p.h +++ b/src/quick/particles/qquickmaskextruder_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickMaskExtruder : public QQuickParticleExtruder { Q_OBJECT diff --git a/src/declarative/particles/qquickparticleaffector.cpp b/src/quick/particles/qquickparticleaffector.cpp similarity index 100% rename from src/declarative/particles/qquickparticleaffector.cpp rename to src/quick/particles/qquickparticleaffector.cpp diff --git a/src/declarative/particles/qquickparticleaffector_p.h b/src/quick/particles/qquickparticleaffector_p.h similarity index 99% rename from src/declarative/particles/qquickparticleaffector_p.h rename to src/quick/particles/qquickparticleaffector_p.h index d254759ff6..94eba70ae4 100644 --- a/src/declarative/particles/qquickparticleaffector_p.h +++ b/src/quick/particles/qquickparticleaffector_p.h @@ -50,8 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickParticleAffector : public QQuickItem { Q_OBJECT diff --git a/src/declarative/particles/qquickparticleemitter.cpp b/src/quick/particles/qquickparticleemitter.cpp similarity index 100% rename from src/declarative/particles/qquickparticleemitter.cpp rename to src/quick/particles/qquickparticleemitter.cpp diff --git a/src/declarative/particles/qquickparticleemitter_p.h b/src/quick/particles/qquickparticleemitter_p.h similarity index 99% rename from src/declarative/particles/qquickparticleemitter_p.h rename to src/quick/particles/qquickparticleemitter_p.h index 2d725e5c9e..bfdb63eef7 100644 --- a/src/declarative/particles/qquickparticleemitter_p.h +++ b/src/quick/particles/qquickparticleemitter_p.h @@ -42,7 +42,7 @@ #ifndef PARTICLEEMITTER_H #define PARTICLEEMITTER_H -#include +#include #include #include "qquickparticlesystem_p.h" #include "qquickparticleextruder_p.h" @@ -55,8 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickParticleEmitter : public QQuickItem { Q_OBJECT diff --git a/src/declarative/particles/qquickparticleextruder.cpp b/src/quick/particles/qquickparticleextruder.cpp similarity index 100% rename from src/declarative/particles/qquickparticleextruder.cpp rename to src/quick/particles/qquickparticleextruder.cpp diff --git a/src/declarative/particles/qquickparticleextruder_p.h b/src/quick/particles/qquickparticleextruder_p.h similarity index 98% rename from src/declarative/particles/qquickparticleextruder_p.h rename to src/quick/particles/qquickparticleextruder_p.h index 7969abad7c..d1f7008a31 100644 --- a/src/declarative/particles/qquickparticleextruder_p.h +++ b/src/quick/particles/qquickparticleextruder_p.h @@ -50,8 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickParticleExtruder : public QObject { Q_OBJECT diff --git a/src/declarative/particles/qquickparticlegroup.cpp b/src/quick/particles/qquickparticlegroup.cpp similarity index 100% rename from src/declarative/particles/qquickparticlegroup.cpp rename to src/quick/particles/qquickparticlegroup.cpp diff --git a/src/declarative/particles/qquickparticlegroup_p.h b/src/quick/particles/qquickparticlegroup_p.h similarity index 100% rename from src/declarative/particles/qquickparticlegroup_p.h rename to src/quick/particles/qquickparticlegroup_p.h diff --git a/src/declarative/particles/qquickparticlepainter.cpp b/src/quick/particles/qquickparticlepainter.cpp similarity index 100% rename from src/declarative/particles/qquickparticlepainter.cpp rename to src/quick/particles/qquickparticlepainter.cpp diff --git a/src/declarative/particles/qquickparticlepainter_p.h b/src/quick/particles/qquickparticlepainter_p.h similarity index 99% rename from src/declarative/particles/qquickparticlepainter_p.h rename to src/quick/particles/qquickparticlepainter_p.h index e80d68fa09..44aac3466f 100644 --- a/src/declarative/particles/qquickparticlepainter_p.h +++ b/src/quick/particles/qquickparticlepainter_p.h @@ -51,9 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickParticlePainter : public QQuickItem { Q_OBJECT diff --git a/src/declarative/particles/qquickparticlesmodule.cpp b/src/quick/particles/qquickparticlesmodule.cpp similarity index 100% rename from src/declarative/particles/qquickparticlesmodule.cpp rename to src/quick/particles/qquickparticlesmodule.cpp diff --git a/src/declarative/particles/qquickparticlesmodule_p.h b/src/quick/particles/qquickparticlesmodule_p.h similarity index 98% rename from src/declarative/particles/qquickparticlesmodule_p.h rename to src/quick/particles/qquickparticlesmodule_p.h index afea56293b..e553b23558 100644 --- a/src/declarative/particles/qquickparticlesmodule_p.h +++ b/src/quick/particles/qquickparticlesmodule_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickParticlesModule { public: diff --git a/src/declarative/particles/qquickparticlesystem.cpp b/src/quick/particles/qquickparticlesystem.cpp similarity index 99% rename from src/declarative/particles/qquickparticlesystem.cpp rename to src/quick/particles/qquickparticlesystem.cpp index 9e6bafab20..9df086a045 100644 --- a/src/declarative/particles/qquickparticlesystem.cpp +++ b/src/quick/particles/qquickparticlesystem.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquickparticlesystem_p.h" -#include +#include #include "qquickparticleemitter_p.h" #include "qquickparticleaffector_p.h" #include "qquickparticlepainter_p.h" diff --git a/src/declarative/particles/qquickparticlesystem_p.h b/src/quick/particles/qquickparticlesystem_p.h similarity index 99% rename from src/declarative/particles/qquickparticlesystem_p.h rename to src/quick/particles/qquickparticlesystem_p.h index 791770af11..6a3403aa93 100644 --- a/src/declarative/particles/qquickparticlesystem_p.h +++ b/src/quick/particles/qquickparticlesystem_p.h @@ -42,7 +42,7 @@ #ifndef PARTICLESYSTEM_H #define PARTICLESYSTEM_H -#include +#include #include #include #include @@ -57,8 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickParticleSystem; class QQuickParticleAffector; class QQuickParticleEmitter; diff --git a/src/declarative/particles/qquickpointattractor.cpp b/src/quick/particles/qquickpointattractor.cpp similarity index 100% rename from src/declarative/particles/qquickpointattractor.cpp rename to src/quick/particles/qquickpointattractor.cpp diff --git a/src/declarative/particles/qquickpointattractor_p.h b/src/quick/particles/qquickpointattractor_p.h similarity index 99% rename from src/declarative/particles/qquickpointattractor_p.h rename to src/quick/particles/qquickpointattractor_p.h index b488e132e3..6c36b299bf 100644 --- a/src/declarative/particles/qquickpointattractor_p.h +++ b/src/quick/particles/qquickpointattractor_p.h @@ -47,8 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickAttractorAffector : public QQuickParticleAffector { Q_OBJECT diff --git a/src/declarative/particles/qquickpointdirection.cpp b/src/quick/particles/qquickpointdirection.cpp similarity index 100% rename from src/declarative/particles/qquickpointdirection.cpp rename to src/quick/particles/qquickpointdirection.cpp diff --git a/src/declarative/particles/qquickpointdirection_p.h b/src/quick/particles/qquickpointdirection_p.h similarity index 99% rename from src/declarative/particles/qquickpointdirection_p.h rename to src/quick/particles/qquickpointdirection_p.h index 29ee7cb613..1a6becda7a 100644 --- a/src/declarative/particles/qquickpointdirection_p.h +++ b/src/quick/particles/qquickpointdirection_p.h @@ -47,8 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickPointDirection : public QQuickDirection { Q_OBJECT diff --git a/src/declarative/particles/qquickrectangleextruder.cpp b/src/quick/particles/qquickrectangleextruder.cpp similarity index 100% rename from src/declarative/particles/qquickrectangleextruder.cpp rename to src/quick/particles/qquickrectangleextruder.cpp diff --git a/src/declarative/particles/qquickrectangleextruder_p.h b/src/quick/particles/qquickrectangleextruder_p.h similarity index 99% rename from src/declarative/particles/qquickrectangleextruder_p.h rename to src/quick/particles/qquickrectangleextruder_p.h index ec8caaeec1..13491b9501 100644 --- a/src/declarative/particles/qquickrectangleextruder_p.h +++ b/src/quick/particles/qquickrectangleextruder_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickRectangleExtruder : public QQuickParticleExtruder { Q_OBJECT diff --git a/src/declarative/particles/qquickspritegoal.cpp b/src/quick/particles/qquickspritegoal.cpp similarity index 100% rename from src/declarative/particles/qquickspritegoal.cpp rename to src/quick/particles/qquickspritegoal.cpp diff --git a/src/declarative/particles/qquickspritegoal_p.h b/src/quick/particles/qquickspritegoal_p.h similarity index 99% rename from src/declarative/particles/qquickspritegoal_p.h rename to src/quick/particles/qquickspritegoal_p.h index b979772a78..3dc4cf88ca 100644 --- a/src/declarative/particles/qquickspritegoal_p.h +++ b/src/quick/particles/qquickspritegoal_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickStochasticEngine; class QQuickSpriteGoalAffector : public QQuickParticleAffector diff --git a/src/declarative/particles/qquicktargetdirection.cpp b/src/quick/particles/qquicktargetdirection.cpp similarity index 100% rename from src/declarative/particles/qquicktargetdirection.cpp rename to src/quick/particles/qquicktargetdirection.cpp diff --git a/src/declarative/particles/qquicktargetdirection_p.h b/src/quick/particles/qquicktargetdirection_p.h similarity index 99% rename from src/declarative/particles/qquicktargetdirection_p.h rename to src/quick/particles/qquicktargetdirection_p.h index 2fc62b3ad8..32b5cb0038 100644 --- a/src/declarative/particles/qquicktargetdirection_p.h +++ b/src/quick/particles/qquicktargetdirection_p.h @@ -46,8 +46,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickItem; class QQuickTargetDirection : public QQuickDirection { diff --git a/src/declarative/particles/qquicktrailemitter.cpp b/src/quick/particles/qquicktrailemitter.cpp similarity index 100% rename from src/declarative/particles/qquicktrailemitter.cpp rename to src/quick/particles/qquicktrailemitter.cpp diff --git a/src/declarative/particles/qquicktrailemitter_p.h b/src/quick/particles/qquicktrailemitter_p.h similarity index 99% rename from src/declarative/particles/qquicktrailemitter_p.h rename to src/quick/particles/qquicktrailemitter_p.h index ad94d7107d..871d8b1b69 100644 --- a/src/declarative/particles/qquicktrailemitter_p.h +++ b/src/quick/particles/qquicktrailemitter_p.h @@ -48,9 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickTrailEmitter : public QQuickParticleEmitter { Q_OBJECT diff --git a/src/declarative/particles/qquickturbulence.cpp b/src/quick/particles/qquickturbulence.cpp similarity index 100% rename from src/declarative/particles/qquickturbulence.cpp rename to src/quick/particles/qquickturbulence.cpp diff --git a/src/declarative/particles/qquickturbulence_p.h b/src/quick/particles/qquickturbulence_p.h similarity index 99% rename from src/declarative/particles/qquickturbulence_p.h rename to src/quick/particles/qquickturbulence_p.h index dc72f40eff..b7eb7e662f 100644 --- a/src/declarative/particles/qquickturbulence_p.h +++ b/src/quick/particles/qquickturbulence_p.h @@ -48,9 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QQuickParticlePainter; class QQuickTurbulenceAffector : public QQuickParticleAffector diff --git a/src/declarative/particles/qquickv8particledata.cpp b/src/quick/particles/qquickv8particledata.cpp similarity index 100% rename from src/declarative/particles/qquickv8particledata.cpp rename to src/quick/particles/qquickv8particledata.cpp diff --git a/src/declarative/particles/qquickv8particledata_p.h b/src/quick/particles/qquickv8particledata_p.h similarity index 98% rename from src/declarative/particles/qquickv8particledata_p.h rename to src/quick/particles/qquickv8particledata_p.h index 811974c132..f94a987aac 100644 --- a/src/declarative/particles/qquickv8particledata_p.h +++ b/src/quick/particles/qquickv8particledata_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QQuickParticleData; class QQuickV8ParticleData { public: diff --git a/src/declarative/particles/qquickwander.cpp b/src/quick/particles/qquickwander.cpp similarity index 100% rename from src/declarative/particles/qquickwander.cpp rename to src/quick/particles/qquickwander.cpp diff --git a/src/declarative/particles/qquickwander_p.h b/src/quick/particles/qquickwander_p.h similarity index 99% rename from src/declarative/particles/qquickwander_p.h rename to src/quick/particles/qquickwander_p.h index 99515fe629..f8a28e57e4 100644 --- a/src/declarative/particles/qquickwander_p.h +++ b/src/quick/particles/qquickwander_p.h @@ -48,9 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - struct WanderData{ qreal x_vel; qreal y_vel; diff --git a/src/declarative/qtquick2.cpp b/src/quick/qtquick2.cpp similarity index 98% rename from src/declarative/qtquick2.cpp rename to src/quick/qtquick2.cpp index ff49641865..f5839af583 100644 --- a/src/declarative/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -51,8 +51,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/declarative/qtquick2_p.h b/src/quick/qtquick2_p.h similarity index 93% rename from src/declarative/qtquick2_p.h rename to src/quick/qtquick2_p.h index 7e2b334124..4fa302dee6 100644 --- a/src/declarative/qtquick2_p.h +++ b/src/quick/qtquick2_p.h @@ -42,15 +42,13 @@ #ifndef QTQUICK2_P_H #define QTQUICK2_P_H -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeQtQuick2Module +class Q_QUICK_PRIVATE_EXPORT QDeclarativeQtQuick2Module { public: static void defineModule(); diff --git a/src/quick/qtquickglobal.h b/src/quick/qtquickglobal.h new file mode 100644 index 0000000000..8619281f29 --- /dev/null +++ b/src/quick/qtquickglobal.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTQUICKGLOBAL_H +#define QTQUICKGLOBAL_H + +#include + +#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +# if defined(QT_MAKEDLL) /* create a Qt DLL library */ +# if defined(QT_BUILD_QUICK_LIB) +# define Q_QUICK_EXPORT Q_DECL_EXPORT +# else +# define Q_QUICK_EXPORT Q_DECL_IMPORT +# endif +# elif defined(QT_DLL) /* use a Qt DLL library */ +# define Q_QUICK_EXPORT Q_DECL_IMPORT +# endif +#endif + +#if !defined(Q_QUICK_EXPORT) +# if defined(QT_SHARED) +# define Q_QUICK_EXPORT Q_DECL_EXPORT +# else +# define Q_QUICK_EXPORT +# endif +#endif + +#endif // QTQUICKGLOBAL_H diff --git a/src/quick/qtquickglobal_p.h b/src/quick/qtquickglobal_p.h new file mode 100644 index 0000000000..6385645ead --- /dev/null +++ b/src/quick/qtquickglobal_p.h @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTQUICKGLOBAL_P_H +#define QTQUICKGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qtquickglobal.h" + +#define Q_QUICK_PRIVATE_EXPORT Q_QUICK_EXPORT + +#endif // QTQUICKGLOBAL_P_H diff --git a/src/quick/quick.pro b/src/quick/quick.pro new file mode 100644 index 0000000000..b445e84248 --- /dev/null +++ b/src/quick/quick.pro @@ -0,0 +1,47 @@ +load(qt_module) + +TARGET = QtQuick + +CONFIG += module +CONFIG += dll warn_on +MODULE_PRI = ../../modules/qt_quick.pri + +QT = core-private gui gui-private network v8-private declarative declarative-private + +DEFINES += QT_BUILD_QUICK_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES +win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS +solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 + +exists("qdeclarative_enable_gcov") { + QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors + LIBS += -lgcov +} + +load(qt_module_config) + +include(util/util.pri) +include(scenegraph/scenegraph.pri) +include(items/items.pri) +include(particles/particles.pri) +include(designer/designer.pri) + +HEADERS += \ + qtquickglobal.h \ + qtquickglobal_p.h \ + qtquick2_p.h + +SOURCES += qtquick2.cpp + +mac { + # FIXME: this is a workaround for broken qmake logic in qtAddModule() + # This function refuses to use frameworks unless the framework exists on + # the filesystem at the time qmake is run, resulting in a build failure + # if QtQuick is qmaked before QtDeclarative is built and frameworks are + # in use. qtAddLibrary() contains correct logic to deal with this, so + # we'll explicitly call that for now. + load(qt) + LIBS -= -lQtDeclarative # in non-framework builds, these should be re-added + LIBS -= -lQtDeclarative_debug # within the qtAddLibrary if appropriate, so no + qtAddLibrary(QtDeclarative) # harm done :) +} + diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp similarity index 100% rename from src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp rename to src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h similarity index 99% rename from src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h rename to src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h index 45cebdd7b9..a4c2ffbdbc 100644 --- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h @@ -50,10 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - - class QSGDefaultRenderer : public QSGRenderer { Q_OBJECT diff --git a/src/declarative/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp similarity index 100% rename from src/declarative/scenegraph/coreapi/qsggeometry.cpp rename to src/quick/scenegraph/coreapi/qsggeometry.cpp diff --git a/src/declarative/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h similarity index 99% rename from src/declarative/scenegraph/coreapi/qsggeometry.h rename to src/quick/scenegraph/coreapi/qsggeometry.h index d7b343c108..aea6f0b94b 100644 --- a/src/declarative/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -42,6 +42,7 @@ #ifndef QSGGEOMETRY_H #define QSGGEOMETRY_H +#include #include #include @@ -49,11 +50,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGGeometryData; -class Q_DECLARATIVE_EXPORT QSGGeometry +class Q_QUICK_EXPORT QSGGeometry { public: diff --git a/src/declarative/scenegraph/coreapi/qsggeometry_p.h b/src/quick/scenegraph/coreapi/qsggeometry_p.h similarity index 100% rename from src/declarative/scenegraph/coreapi/qsggeometry_p.h rename to src/quick/scenegraph/coreapi/qsggeometry_p.h diff --git a/src/declarative/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp similarity index 100% rename from src/declarative/scenegraph/coreapi/qsgmaterial.cpp rename to src/quick/scenegraph/coreapi/qsgmaterial.cpp diff --git a/src/declarative/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h similarity index 96% rename from src/declarative/scenegraph/coreapi/qsgmaterial.h rename to src/quick/scenegraph/coreapi/qsgmaterial.h index 084219bfba..d8411b4d88 100644 --- a/src/declarative/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -42,20 +42,19 @@ #ifndef MATERIAL_H #define MATERIAL_H +#include #include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGMaterial; -class Q_DECLARATIVE_EXPORT QSGMaterialShader +class Q_QUICK_EXPORT QSGMaterialShader { public: - class Q_DECLARATIVE_EXPORT RenderState { + class Q_QUICK_EXPORT RenderState { public: enum DirtyState { @@ -110,7 +109,7 @@ class Q_DECLARATIVE_EXPORT QSGMaterialShader struct QSGMaterialType { }; -class Q_DECLARATIVE_EXPORT QSGMaterial +class Q_QUICK_EXPORT QSGMaterial { public: enum Flag { diff --git a/src/declarative/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp similarity index 99% rename from src/declarative/scenegraph/coreapi/qsgnode.cpp rename to src/quick/scenegraph/coreapi/qsgnode.cpp index 764071c190..2d6828323c 100644 --- a/src/declarative/scenegraph/coreapi/qsgnode.cpp +++ b/src/quick/scenegraph/coreapi/qsgnode.cpp @@ -62,7 +62,7 @@ static void qt_print_node_count() \class QSGNode \brief The QSGNode class is the base class for all nodes in the scene graph. - \inmodule QtDeclarative + \inmodule QtQuick The QSGNode class can be used as a child container. Children are added with the appendChildNode(), prependChildNode(), insertChildNodeBefore() and @@ -480,7 +480,7 @@ void QSGNode::markDirty(DirtyFlags flags) \class QSGBasicGeometryNode \brief The QSGBasicGeometryNode class serves as a baseclass for geometry based nodes - \inmodule QtDeclarative + \inmodule QtQuick The QSGBasicGeometryNode class should not be used by itself. It is only encapsulates shared functionality between the QSGGeometryNode and QSGClipNode classes. @@ -543,7 +543,7 @@ void QSGBasicGeometryNode::setGeometry(QSGGeometry *geometry) \class QSGGeometryNode \brief The QSGGeometryNode class is used for all rendered content in the scene graph. - \inmodule QtDeclarative + \inmodule QtQuick The QSGGeometryNode consists of geometry and material. The geometry defines the mesh, the vertices and their structure, to be drawn. The Material defines how the shape is @@ -712,7 +712,7 @@ void QSGGeometryNode::setInheritedOpacity(qreal opacity) \class QSGClipNode \brief The QSGClipNode class implements the clipping functionality in the scene graph. - \inmodule QtDeclarative + \inmodule QtQuick Clipping applies to the node's subtree and can be nested. Multiple clip nodes will be accumulated by intersecting all their geometries. The accumulation happens @@ -800,7 +800,7 @@ void QSGClipNode::setClipRect(const QRectF &rect) \class QSGTransformNode \brief The QSGTransformNode class implements transformations in the scene graph - \inmodule QtDeclarative + \inmodule QtQuick Transformations apply the node's subtree and can be nested. Multiple transform nodes will be accumulated by intersecting all their matrices. The accumulation happens @@ -921,7 +921,7 @@ void QSGRootNode::notifyNodeChange(QSGNode *node, DirtyFlags flags) \class QSGOpacityNode \brief The QSGOpacityNode class is used to change opacity of nodes. - \inmodule QtDeclarative + \inmodule QtQuick Opacity applies to its subtree and can be nested. Multiple opacity nodes will be accumulated by multiplying their opacity. The accumulation happens diff --git a/src/declarative/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h similarity index 90% rename from src/declarative/scenegraph/coreapi/qsgnode.h rename to src/quick/scenegraph/coreapi/qsgnode.h index 58afff4bc7..41c63e27b6 100644 --- a/src/declarative/scenegraph/coreapi/qsgnode.h +++ b/src/quick/scenegraph/coreapi/qsgnode.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - #define QML_RUNTIME_TESTING class QSGRenderer; @@ -63,7 +61,7 @@ class QSGGeometryNode; class QSGTransformNode; class QSGClipNode; -class Q_DECLARATIVE_EXPORT QSGNode +class Q_QUICK_EXPORT QSGNode { public: enum NodeType { @@ -173,7 +171,7 @@ class Q_DECLARATIVE_EXPORT QSGNode Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::DirtyFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags) -class Q_DECLARATIVE_EXPORT QSGBasicGeometryNode : public QSGNode +class Q_QUICK_EXPORT QSGBasicGeometryNode : public QSGNode { public: // enum UsagePattern { @@ -211,7 +209,7 @@ class Q_DECLARATIVE_EXPORT QSGBasicGeometryNode : public QSGNode class QSGMaterial; -class Q_DECLARATIVE_EXPORT QSGGeometryNode : public QSGBasicGeometryNode +class Q_QUICK_EXPORT QSGGeometryNode : public QSGBasicGeometryNode { public: QSGGeometryNode(); @@ -241,7 +239,7 @@ class Q_DECLARATIVE_EXPORT QSGGeometryNode : public QSGBasicGeometryNode qreal m_opacity; }; -class Q_DECLARATIVE_EXPORT QSGClipNode : public QSGBasicGeometryNode +class Q_QUICK_EXPORT QSGClipNode : public QSGBasicGeometryNode { public: QSGClipNode(); @@ -261,7 +259,7 @@ class Q_DECLARATIVE_EXPORT QSGClipNode : public QSGBasicGeometryNode }; -class Q_DECLARATIVE_EXPORT QSGTransformNode : public QSGNode +class Q_QUICK_EXPORT QSGTransformNode : public QSGNode { public: QSGTransformNode(); @@ -279,7 +277,7 @@ class Q_DECLARATIVE_EXPORT QSGTransformNode : public QSGNode }; -class Q_DECLARATIVE_EXPORT QSGRootNode : public QSGNode +class Q_QUICK_EXPORT QSGRootNode : public QSGNode { public: QSGRootNode(); @@ -296,7 +294,7 @@ class Q_DECLARATIVE_EXPORT QSGRootNode : public QSGNode }; -class Q_DECLARATIVE_EXPORT QSGOpacityNode : public QSGNode +class Q_QUICK_EXPORT QSGOpacityNode : public QSGNode { public: QSGOpacityNode(); @@ -315,7 +313,7 @@ class Q_DECLARATIVE_EXPORT QSGOpacityNode : public QSGNode qreal m_combined_opacity; }; -class Q_DECLARATIVE_EXPORT QSGNodeVisitor { +class Q_QUICK_EXPORT QSGNodeVisitor { public: virtual ~QSGNodeVisitor(); @@ -333,11 +331,11 @@ class Q_DECLARATIVE_EXPORT QSGNodeVisitor { }; #ifndef QT_NO_DEBUG_STREAM -Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGNode *n); -Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGGeometryNode *n); -Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGTransformNode *n); -Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGOpacityNode *n); -Q_DECLARATIVE_EXPORT QDebug operator<<(QDebug, const QSGRootNode *n); +Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGNode *n); +Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGGeometryNode *n); +Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGTransformNode *n); +Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGOpacityNode *n); +Q_QUICK_EXPORT QDebug operator<<(QDebug, const QSGRootNode *n); #endif diff --git a/src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp similarity index 100% rename from src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp rename to src/quick/scenegraph/coreapi/qsgnodeupdater.cpp diff --git a/src/declarative/scenegraph/coreapi/qsgnodeupdater_p.h b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h similarity index 98% rename from src/declarative/scenegraph/coreapi/qsgnodeupdater_p.h rename to src/quick/scenegraph/coreapi/qsgnodeupdater_p.h index 25d7c11fa1..446bdefdc5 100644 --- a/src/declarative/scenegraph/coreapi/qsgnodeupdater_p.h +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -class Q_DECLARATIVE_EXPORT QSGNodeUpdater +class Q_QUICK_EXPORT QSGNodeUpdater { public: QSGNodeUpdater(); diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp similarity index 100% rename from src/declarative/scenegraph/coreapi/qsgrenderer.cpp rename to src/quick/scenegraph/coreapi/qsgrenderer.cpp diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h similarity index 96% rename from src/declarative/scenegraph/coreapi/qsgrenderer_p.h rename to src/quick/scenegraph/coreapi/qsgrenderer_p.h index 05fb9b42fd..e5667c710a 100644 --- a/src/declarative/scenegraph/coreapi/qsgrenderer_p.h +++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h @@ -51,16 +51,14 @@ #include "qsgnode.h" #include "qsgmaterial.h" -#include "qsgtexture.h" +#include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGMaterialShader; struct QSGMaterialType; class QOpenGLFramebufferObject; @@ -68,7 +66,7 @@ class TextureReference; class QSGBindable; class QSGNodeUpdater; -class Q_DECLARATIVE_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions +class Q_QUICK_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions { Q_OBJECT public: @@ -183,7 +181,7 @@ class Q_DECLARATIVE_EXPORT QSGRenderer : public QObject, public QOpenGLFunctions Q_DECLARE_OPERATORS_FOR_FLAGS(QSGRenderer::ClearMode) -class Q_DECLARATIVE_EXPORT QSGBindable +class Q_QUICK_EXPORT QSGBindable { public: virtual ~QSGBindable() { } @@ -212,7 +210,7 @@ QSGMaterialShader::RenderState QSGRenderer::state(QSGMaterialShader::RenderState } -class Q_DECLARATIVE_EXPORT QSGNodeDumper : public QSGNodeVisitor { +class Q_QUICK_EXPORT QSGNodeDumper : public QSGNodeVisitor { public: static void dump(QSGNode *n); diff --git a/src/declarative/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp similarity index 98% rename from src/declarative/scenegraph/qsgadaptationlayer.cpp rename to src/quick/scenegraph/qsgadaptationlayer.cpp index 966a24acd3..972bff80e0 100644 --- a/src/declarative/scenegraph/qsgadaptationlayer.cpp +++ b/src/quick/scenegraph/qsgadaptationlayer.cpp @@ -42,8 +42,8 @@ #include "qsgadaptationlayer_p.h" #include -#include -#include +#include +#include #include #include #include diff --git a/src/declarative/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h similarity index 95% rename from src/declarative/scenegraph/qsgadaptationlayer_p.h rename to src/quick/scenegraph/qsgadaptationlayer_p.h index 82e0c7cf42..5912802a84 100644 --- a/src/declarative/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -42,8 +42,8 @@ #ifndef ADAPTATIONINTERFACES_H #define ADAPTATIONINTERFACES_H -#include "qsgnode.h" -#include "qsgtexture.h" +#include +#include #include #include #include @@ -56,14 +56,12 @@ #include // ### remove -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGNode; class QImage; class TextureReference; @@ -71,7 +69,7 @@ class QSGDistanceFieldGlyphCacheManager; class QSGDistanceFieldGlyphNode; // TODO: Rename from XInterface to AbstractX. -class Q_DECLARATIVE_EXPORT QSGRectangleNode : public QSGGeometryNode +class Q_QUICK_EXPORT QSGRectangleNode : public QSGGeometryNode { public: virtual void setRect(const QRectF &rect) = 0; @@ -86,7 +84,7 @@ class Q_DECLARATIVE_EXPORT QSGRectangleNode : public QSGGeometryNode }; -class Q_DECLARATIVE_EXPORT QSGImageNode : public QSGGeometryNode +class Q_QUICK_EXPORT QSGImageNode : public QSGGeometryNode { public: virtual void setTargetRect(const QRectF &rect) = 0; @@ -102,7 +100,7 @@ class Q_DECLARATIVE_EXPORT QSGImageNode : public QSGGeometryNode }; -class Q_DECLARATIVE_EXPORT QSGGlyphNode : public QSGGeometryNode +class Q_QUICK_EXPORT QSGGlyphNode : public QSGGeometryNode { public: enum AntialiasingMode @@ -129,7 +127,7 @@ class Q_DECLARATIVE_EXPORT QSGGlyphNode : public QSGGeometryNode QRectF m_bounding_rect; }; -class Q_DECLARATIVE_EXPORT QSGDistanceFieldGlyphCache +class Q_QUICK_EXPORT QSGDistanceFieldGlyphCache { public: QSGDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font); diff --git a/src/declarative/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp similarity index 97% rename from src/declarative/scenegraph/qsgcontext.cpp rename to src/quick/scenegraph/qsgcontext.cpp index 1545303d4a..93fea15921 100644 --- a/src/declarative/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -39,22 +39,22 @@ ** ****************************************************************************/ -#include -#include -#include "qsgnode.h" +#include "qsgcontext_p.h" +#include +#include -#include +#include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -62,6 +62,7 @@ #include #include +#include DEFINE_BOOL_CONFIG_OPTION(qmlFlashMode, QML_FLASH_MODE) DEFINE_BOOL_CONFIG_OPTION(qmlTranslucentMode, QML_TRANSLUCENT_MODE) diff --git a/src/declarative/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h similarity index 97% rename from src/declarative/scenegraph/qsgcontext_p.h rename to src/quick/scenegraph/qsgcontext_p.h index ed1654b8fc..ded9d2727a 100644 --- a/src/declarative/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -50,14 +50,12 @@ #include -#include "qsgnode.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGContextPrivate; class QSGRectangleNode; class QSGImageNode; @@ -75,7 +73,7 @@ class QOpenGLFramebufferObject; class QDeclarativeTextureFactory; -class Q_DECLARATIVE_EXPORT QSGContext : public QObject +class Q_QUICK_EXPORT QSGContext : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QSGContext) diff --git a/src/declarative/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp similarity index 98% rename from src/declarative/scenegraph/qsgcontextplugin.cpp rename to src/quick/scenegraph/qsgcontextplugin.cpp index 79bcbf9c04..a07793f44f 100644 --- a/src/declarative/scenegraph/qsgcontextplugin.cpp +++ b/src/quick/scenegraph/qsgcontextplugin.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qsgcontextplugin_p.h" -#include +#include #include #include #include diff --git a/src/declarative/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h similarity index 92% rename from src/declarative/scenegraph/qsgcontextplugin_p.h rename to src/quick/scenegraph/qsgcontextplugin_p.h index 78c4a25372..a480ee51eb 100644 --- a/src/declarative/scenegraph/qsgcontextplugin_p.h +++ b/src/quick/scenegraph/qsgcontextplugin_p.h @@ -42,6 +42,7 @@ #ifndef QSGCONTEXTPLUGIN_H #define QSGCONTEXTPLUGIN_H +#include #include #include @@ -49,11 +50,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGContext; -struct Q_DECLARATIVE_EXPORT QSGContextFactoryInterface : public QFactoryInterface +struct Q_QUICK_EXPORT QSGContextFactoryInterface : public QFactoryInterface { virtual QSGContext *create(const QString &key) const = 0; }; @@ -62,7 +61,7 @@ struct Q_DECLARATIVE_EXPORT QSGContextFactoryInterface : public QFactoryInterfac "com.trolltech.Qt.QSGContextFactoryInterface" Q_DECLARE_INTERFACE(QSGContextFactoryInterface, QSGContextFactoryInterface_iid) -class Q_DECLARATIVE_EXPORT QSGContextPlugin : public QObject, public QSGContextFactoryInterface +class Q_QUICK_EXPORT QSGContextPlugin : public QObject, public QSGContextFactoryInterface { Q_OBJECT Q_INTERFACES(QSGContextFactoryInterface:QFactoryInterface) diff --git a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp similarity index 99% rename from src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp rename to src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp index 3dfa1bd269..95ccc8f437 100644 --- a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp @@ -41,7 +41,7 @@ #include "qsgdefaultdistancefieldglyphcache_p.h" -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h similarity index 98% rename from src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache_p.h rename to src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h index 28860912c8..b52ec45107 100644 --- a/src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache_p.h +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -class Q_DECLARATIVE_EXPORT QSGDefaultDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache +class Q_QUICK_EXPORT QSGDefaultDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache { public: QSGDefaultDistanceFieldGlyphCache(QSGDistanceFieldGlyphCacheManager *man, QOpenGLContext *c, const QRawFont &font); diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode.cpp b/src/quick/scenegraph/qsgdefaultglyphnode.cpp similarity index 100% rename from src/declarative/scenegraph/qsgdefaultglyphnode.cpp rename to src/quick/scenegraph/qsgdefaultglyphnode.cpp diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp similarity index 99% rename from src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp rename to src/quick/scenegraph/qsgdefaultglyphnode_p.cpp index 3476ab1665..36efe9b570 100644 --- a/src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p.h similarity index 98% rename from src/declarative/scenegraph/qsgdefaultglyphnode_p.h rename to src/quick/scenegraph/qsgdefaultglyphnode_p.h index f9d163c425..cc14d33a30 100644 --- a/src/declarative/scenegraph/qsgdefaultglyphnode_p.h +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.h @@ -43,14 +43,12 @@ #define DEFAULT_GLYPHNODE_H #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QGlyphs; class QSGTextMaskMaterial; class QSGDefaultGlyphNode: public QSGGlyphNode diff --git a/src/declarative/scenegraph/qsgdefaultglyphnode_p_p.h b/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h similarity index 95% rename from src/declarative/scenegraph/qsgdefaultglyphnode_p_p.h rename to src/quick/scenegraph/qsgdefaultglyphnode_p_p.h index d22bc33fea..2378178a1b 100644 --- a/src/declarative/scenegraph/qsgdefaultglyphnode_p_p.h +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p_p.h @@ -43,11 +43,11 @@ #define TEXTMASKMATERIAL_H #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/scenegraph/qsgdefaultimagenode.cpp b/src/quick/scenegraph/qsgdefaultimagenode.cpp similarity index 99% rename from src/declarative/scenegraph/qsgdefaultimagenode.cpp rename to src/quick/scenegraph/qsgdefaultimagenode.cpp index f30a7e2675..f360aaef0d 100644 --- a/src/declarative/scenegraph/qsgdefaultimagenode.cpp +++ b/src/quick/scenegraph/qsgdefaultimagenode.cpp @@ -41,7 +41,7 @@ #include "qsgdefaultimagenode_p.h" -#include +#include #include #include diff --git a/src/declarative/scenegraph/qsgdefaultimagenode_p.h b/src/quick/scenegraph/qsgdefaultimagenode_p.h similarity index 97% rename from src/declarative/scenegraph/qsgdefaultimagenode_p.h rename to src/quick/scenegraph/qsgdefaultimagenode_p.h index db11cd9181..f1b416d69c 100644 --- a/src/declarative/scenegraph/qsgdefaultimagenode_p.h +++ b/src/quick/scenegraph/qsgdefaultimagenode_p.h @@ -45,14 +45,12 @@ #include -#include "qsgtexturematerial.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGDefaultImageNode : public QSGImageNode { public: diff --git a/src/declarative/scenegraph/qsgdefaultrectanglenode.cpp b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp similarity index 99% rename from src/declarative/scenegraph/qsgdefaultrectanglenode.cpp rename to src/quick/scenegraph/qsgdefaultrectanglenode.cpp index 4753b6021e..bb89b4a9f8 100644 --- a/src/declarative/scenegraph/qsgdefaultrectanglenode.cpp +++ b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp @@ -44,10 +44,10 @@ #include "qsgdefaultrectanglenode_p.h" -#include -#include "qsgtexturematerial.h" +#include +#include -#include +#include #include #include diff --git a/src/declarative/scenegraph/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h similarity index 98% rename from src/declarative/scenegraph/qsgdefaultrectanglenode_p.h rename to src/quick/scenegraph/qsgdefaultrectanglenode_p.h index 6a197136cf..b491913428 100644 --- a/src/declarative/scenegraph/qsgdefaultrectanglenode_p.h +++ b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h @@ -45,14 +45,12 @@ #include -#include "qsgflatcolormaterial.h" +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGMaterial; class QSGContext; diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp similarity index 99% rename from src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp rename to src/quick/scenegraph/qsgdistancefieldglyphnode.cpp index e4a39e484b..d3b90bed60 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode.cpp @@ -41,8 +41,8 @@ #include "qsgdistancefieldglyphnode_p.h" #include "qsgdistancefieldglyphnode_p_p.h" -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp similarity index 99% rename from src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp rename to src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp index a506e23cc1..3852b01518 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qsgdistancefieldglyphnode_p_p.h" -#include -#include +#include +#include #include #include diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h similarity index 97% rename from src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h rename to src/quick/scenegraph/qsgdistancefieldglyphnode_p.h index f4877b0a1d..8096d4ae70 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.h @@ -43,16 +43,14 @@ #define DISTANCEFIELD_GLYPHNODE_H #include -#include "qsgtexture.h" +#include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGDistanceFieldGlyphCacheManager; class QSGDistanceFieldTextMaterial; class QSGDistanceFieldGlyphNode: public QSGGlyphNode diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h similarity index 99% rename from src/declarative/scenegraph/qsgdistancefieldglyphnode_p_p.h rename to src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h index c8c73bfac0..dbdc6e2498 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p_p.h +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h @@ -42,7 +42,7 @@ #ifndef DISTANCEFIELDTEXTMATERIAL_H #define DISTANCEFIELDTEXTMATERIAL_H -#include +#include #include "qsgdistancefieldglyphnode_p.h" #include "qsgadaptationlayer_p.h" diff --git a/src/declarative/scenegraph/qsgflashnode.cpp b/src/quick/scenegraph/qsgflashnode.cpp similarity index 100% rename from src/declarative/scenegraph/qsgflashnode.cpp rename to src/quick/scenegraph/qsgflashnode.cpp diff --git a/src/declarative/scenegraph/qsgflashnode_p.h b/src/quick/scenegraph/qsgflashnode_p.h similarity index 97% rename from src/declarative/scenegraph/qsgflashnode_p.h rename to src/quick/scenegraph/qsgflashnode_p.h index 0967fa8901..71ac22d648 100644 --- a/src/declarative/scenegraph/qsgflashnode_p.h +++ b/src/quick/scenegraph/qsgflashnode_p.h @@ -42,14 +42,12 @@ #ifndef QSGFLASHNODE_H #define QSGFLASHNODE_H -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGFlashNode : public QSGSimpleRectNode { public: diff --git a/src/declarative/scenegraph/qsgpathsimplifier.cpp b/src/quick/scenegraph/qsgpathsimplifier.cpp similarity index 100% rename from src/declarative/scenegraph/qsgpathsimplifier.cpp rename to src/quick/scenegraph/qsgpathsimplifier.cpp diff --git a/src/declarative/scenegraph/qsgpathsimplifier_p.h b/src/quick/scenegraph/qsgpathsimplifier_p.h similarity index 100% rename from src/declarative/scenegraph/qsgpathsimplifier_p.h rename to src/quick/scenegraph/qsgpathsimplifier_p.h diff --git a/src/declarative/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri similarity index 100% rename from src/declarative/scenegraph/scenegraph.pri rename to src/quick/scenegraph/scenegraph.pri diff --git a/src/declarative/scenegraph/util/qsgareaallocator.cpp b/src/quick/scenegraph/util/qsgareaallocator.cpp similarity index 100% rename from src/declarative/scenegraph/util/qsgareaallocator.cpp rename to src/quick/scenegraph/util/qsgareaallocator.cpp diff --git a/src/declarative/scenegraph/util/qsgareaallocator_p.h b/src/quick/scenegraph/util/qsgareaallocator_p.h similarity index 97% rename from src/declarative/scenegraph/util/qsgareaallocator_p.h rename to src/quick/scenegraph/util/qsgareaallocator_p.h index fd79d4c67a..be26046865 100644 --- a/src/declarative/scenegraph/util/qsgareaallocator_p.h +++ b/src/quick/scenegraph/util/qsgareaallocator_p.h @@ -42,6 +42,7 @@ #ifndef AREAALLOCATOR_H #define AREAALLOCATOR_H +#include #include QT_BEGIN_NAMESPACE @@ -49,7 +50,7 @@ QT_BEGIN_NAMESPACE class QRect; class QPoint; struct QSGAreaAllocatorNode; -class Q_DECLARATIVE_EXPORT QSGAreaAllocator +class Q_QUICK_EXPORT QSGAreaAllocator { public: QSGAreaAllocator(const QSize &size); diff --git a/src/declarative/scenegraph/util/qsgdistancefieldutil.cpp b/src/quick/scenegraph/util/qsgdistancefieldutil.cpp similarity index 99% rename from src/declarative/scenegraph/util/qsgdistancefieldutil.cpp rename to src/quick/scenegraph/util/qsgdistancefieldutil.cpp index 3429162d6b..d1b0445ee0 100644 --- a/src/declarative/scenegraph/util/qsgdistancefieldutil.cpp +++ b/src/quick/scenegraph/util/qsgdistancefieldutil.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/scenegraph/util/qsgdistancefieldutil_p.h b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h similarity index 98% rename from src/declarative/scenegraph/util/qsgdistancefieldutil_p.h rename to src/quick/scenegraph/util/qsgdistancefieldutil_p.h index 93dffab76e..bc28a4d9e1 100644 --- a/src/declarative/scenegraph/util/qsgdistancefieldutil_p.h +++ b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h @@ -79,7 +79,7 @@ class QOpenGLShaderProgram; class QSGDistanceFieldGlyphCache; class QSGContext; -class Q_DECLARATIVE_EXPORT QSGDistanceFieldGlyphCacheManager +class Q_QUICK_EXPORT QSGDistanceFieldGlyphCacheManager { public: QSGDistanceFieldGlyphCacheManager(QSGContext *c); diff --git a/src/declarative/scenegraph/util/qsgengine.cpp b/src/quick/scenegraph/util/qsgengine.cpp similarity index 98% rename from src/declarative/scenegraph/util/qsgengine.cpp rename to src/quick/scenegraph/util/qsgengine.cpp index 88eeebc472..b8c93bab8b 100644 --- a/src/declarative/scenegraph/util/qsgengine.cpp +++ b/src/quick/scenegraph/util/qsgengine.cpp @@ -41,7 +41,7 @@ #include "qsgengine.h" -#include +#include #include #include diff --git a/src/declarative/scenegraph/util/qsgengine.h b/src/quick/scenegraph/util/qsgengine.h similarity index 96% rename from src/declarative/scenegraph/util/qsgengine.h rename to src/quick/scenegraph/util/qsgengine.h index 0cbbcddfec..6b7ceb939f 100644 --- a/src/declarative/scenegraph/util/qsgengine.h +++ b/src/quick/scenegraph/util/qsgengine.h @@ -44,19 +44,17 @@ #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGEnginePrivate; class QQuickCanvas; -class Q_DECLARATIVE_EXPORT QSGEngine : public QObject +class Q_QUICK_EXPORT QSGEngine : public QObject { Q_OBJECT diff --git a/src/declarative/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp similarity index 99% rename from src/declarative/scenegraph/util/qsgflatcolormaterial.cpp rename to src/quick/scenegraph/util/qsgflatcolormaterial.cpp index ee73616e4f..cf5c7869ea 100644 --- a/src/declarative/scenegraph/util/qsgflatcolormaterial.cpp +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp @@ -122,7 +122,7 @@ const char *FlatColorMaterialShader::fragmentShader() const { \brief The QSGFlatColorMaterial class provides a convenient way of rendering solid colored geometry in the scene graph. - \inmodule QtDeclarative + \inmodule QtQuick The flat color material will fill every pixel in a geometry using a solid color. The color can contain transparency. diff --git a/src/declarative/scenegraph/util/qsgflatcolormaterial.h b/src/quick/scenegraph/util/qsgflatcolormaterial.h similarity index 94% rename from src/declarative/scenegraph/util/qsgflatcolormaterial.h rename to src/quick/scenegraph/util/qsgflatcolormaterial.h index f6345b6483..d788901b8a 100644 --- a/src/declarative/scenegraph/util/qsgflatcolormaterial.h +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h @@ -42,16 +42,14 @@ #ifndef FLATCOLORMATERIAL_H #define FLATCOLORMATERIAL_H -#include +#include #include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - -class Q_DECLARATIVE_EXPORT QSGFlatColorMaterial : public QSGMaterial +class Q_QUICK_EXPORT QSGFlatColorMaterial : public QSGMaterial { public: QSGFlatColorMaterial(); diff --git a/src/declarative/scenegraph/util/qsgpainternode.cpp b/src/quick/scenegraph/util/qsgpainternode.cpp similarity index 99% rename from src/declarative/scenegraph/util/qsgpainternode.cpp rename to src/quick/scenegraph/util/qsgpainternode.cpp index f3e5202241..640aab967e 100644 --- a/src/declarative/scenegraph/util/qsgpainternode.cpp +++ b/src/quick/scenegraph/util/qsgpainternode.cpp @@ -41,9 +41,9 @@ #include "qsgpainternode_p.h" -#include +#include -#include +#include #include #include #include diff --git a/src/declarative/scenegraph/util/qsgpainternode_p.h b/src/quick/scenegraph/util/qsgpainternode_p.h similarity index 95% rename from src/declarative/scenegraph/util/qsgpainternode_p.h rename to src/quick/scenegraph/util/qsgpainternode_p.h index 8e95107efc..85f26f6056 100644 --- a/src/declarative/scenegraph/util/qsgpainternode_p.h +++ b/src/quick/scenegraph/util/qsgpainternode_p.h @@ -42,11 +42,11 @@ #ifndef QSGPAINTERNODE_P_H #define QSGPAINTERNODE_P_H -#include "qsgnode.h" +#include #include "qsgtexturematerial.h" #include "qsgtexture_p.h" -#include +#include #include @@ -54,12 +54,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QOpenGLFramebufferObject; class QOpenGLPaintDevice; -class Q_DECLARATIVE_EXPORT QSGPainterTexture : public QSGPlainTexture +class Q_QUICK_EXPORT QSGPainterTexture : public QSGPlainTexture { public: QSGPainterTexture(); @@ -72,7 +70,7 @@ class Q_DECLARATIVE_EXPORT QSGPainterTexture : public QSGPlainTexture QRect m_dirty_rect; }; -class Q_DECLARATIVE_EXPORT QSGPainterNode : public QSGGeometryNode +class Q_QUICK_EXPORT QSGPainterNode : public QSGGeometryNode { public: QSGPainterNode(QQuickPaintedItem *item); diff --git a/src/declarative/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h similarity index 99% rename from src/declarative/scenegraph/util/qsgsimplematerial.h rename to src/quick/scenegraph/util/qsgsimplematerial.h index b9e453abec..44beb135f7 100644 --- a/src/declarative/scenegraph/util/qsgsimplematerial.h +++ b/src/quick/scenegraph/util/qsgsimplematerial.h @@ -42,14 +42,12 @@ #ifndef QSGSIMPLEMATERIAL_H #define QSGSIMPLEMATERIAL_H -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - template class QSGSimpleMaterialShader : public QSGMaterialShader { diff --git a/src/declarative/scenegraph/util/qsgsimplerectnode.cpp b/src/quick/scenegraph/util/qsgsimplerectnode.cpp similarity index 100% rename from src/declarative/scenegraph/util/qsgsimplerectnode.cpp rename to src/quick/scenegraph/util/qsgsimplerectnode.cpp diff --git a/src/declarative/scenegraph/util/qsgsimplerectnode.h b/src/quick/scenegraph/util/qsgsimplerectnode.h similarity index 95% rename from src/declarative/scenegraph/util/qsgsimplerectnode.h rename to src/quick/scenegraph/util/qsgsimplerectnode.h index c06db07f93..6519290cfe 100644 --- a/src/declarative/scenegraph/util/qsgsimplerectnode.h +++ b/src/quick/scenegraph/util/qsgsimplerectnode.h @@ -42,16 +42,14 @@ #ifndef SOLIDRECTNODE_H #define SOLIDRECTNODE_H -#include "qsgnode.h" +#include #include "qsgflatcolormaterial.h" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - -class Q_DECLARATIVE_EXPORT QSGSimpleRectNode : public QSGGeometryNode +class Q_QUICK_EXPORT QSGSimpleRectNode : public QSGGeometryNode { public: QSGSimpleRectNode(const QRectF &rect, const QColor &color); diff --git a/src/declarative/scenegraph/util/qsgsimpletexturenode.cpp b/src/quick/scenegraph/util/qsgsimpletexturenode.cpp similarity index 99% rename from src/declarative/scenegraph/util/qsgsimpletexturenode.cpp rename to src/quick/scenegraph/util/qsgsimpletexturenode.cpp index a0d6616371..00b240e435 100644 --- a/src/declarative/scenegraph/util/qsgsimpletexturenode.cpp +++ b/src/quick/scenegraph/util/qsgsimpletexturenode.cpp @@ -61,7 +61,7 @@ static void qsgsimpletexturenode_update(QSGGeometry *g, \brief The QSGSimpleTextureNode class is provided for convenience to easily draw textured content using the QML scene graph. - \inmodule QtDeclarative + \inmodule QtQuick \warning The simple texture node class must have a texture before being added to the scene graph to be rendered. diff --git a/src/declarative/scenegraph/util/qsgsimpletexturenode.h b/src/quick/scenegraph/util/qsgsimpletexturenode.h similarity index 94% rename from src/declarative/scenegraph/util/qsgsimpletexturenode.h rename to src/quick/scenegraph/util/qsgsimpletexturenode.h index db58c30b5f..605cae11e4 100644 --- a/src/declarative/scenegraph/util/qsgsimpletexturenode.h +++ b/src/quick/scenegraph/util/qsgsimpletexturenode.h @@ -42,17 +42,15 @@ #ifndef QSGSIMPLETEXTURENODE_H #define QSGSIMPLETEXTURENODE_H -#include "qsgnode.h" -#include "qsggeometry.h" +#include +#include #include "qsgtexturematerial.h" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - -class Q_DECLARATIVE_EXPORT QSGSimpleTextureNode : public QSGGeometryNode +class Q_QUICK_EXPORT QSGSimpleTextureNode : public QSGGeometryNode { public: QSGSimpleTextureNode(); diff --git a/src/declarative/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp similarity index 99% rename from src/declarative/scenegraph/util/qsgtexture.cpp rename to src/quick/scenegraph/util/qsgtexture.cpp index e2219e54f5..0abbc8dae1 100644 --- a/src/declarative/scenegraph/util/qsgtexture.cpp +++ b/src/quick/scenegraph/util/qsgtexture.cpp @@ -41,9 +41,9 @@ #define GL_GLEXT_PROTOTYPES -#include +#include "qsgtexture_p.h" #include -#include +#include #include #include diff --git a/src/declarative/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h similarity index 96% rename from src/declarative/scenegraph/util/qsgtexture.h rename to src/quick/scenegraph/util/qsgtexture.h index 1a49fb941e..6fdab9f401 100644 --- a/src/declarative/scenegraph/util/qsgtexture.h +++ b/src/quick/scenegraph/util/qsgtexture.h @@ -42,6 +42,7 @@ #ifndef QSGTEXTURE_H #define QSGTEXTURE_H +#include #include #include @@ -49,10 +50,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QSGTexturePrivate; -class Q_DECLARATIVE_EXPORT QSGTexture : public QObject +class Q_QUICK_EXPORT QSGTexture : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QSGTexture) @@ -119,7 +118,7 @@ QRectF QSGTexture::convertToNormalizedSourceRect(const QRectF &rect) const } -class Q_DECLARATIVE_EXPORT QSGDynamicTexture : public QSGTexture +class Q_QUICK_EXPORT QSGDynamicTexture : public QSGTexture { Q_OBJECT public: diff --git a/src/declarative/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h similarity index 96% rename from src/declarative/scenegraph/util/qsgtexture_p.h rename to src/quick/scenegraph/util/qsgtexture_p.h index f14508fd25..e1d6dd0e32 100644 --- a/src/declarative/scenegraph/util/qsgtexture_p.h +++ b/src/quick/scenegraph/util/qsgtexture_p.h @@ -42,12 +42,13 @@ #ifndef QSGTEXTURE_P_H #define QSGTEXTURE_P_H +#include #include #include #include "qsgtexture.h" -#include +#include QT_BEGIN_NAMESPACE @@ -66,7 +67,7 @@ class QSGTexturePrivate : public QObjectPrivate uint filterMode : 2; }; -class Q_DECLARATIVE_EXPORT QSGPlainTexture : public QSGTexture +class Q_QUICK_EXPORT QSGPlainTexture : public QSGTexture { Q_OBJECT public: diff --git a/src/declarative/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp similarity index 100% rename from src/declarative/scenegraph/util/qsgtexturematerial.cpp rename to src/quick/scenegraph/util/qsgtexturematerial.cpp diff --git a/src/declarative/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h similarity index 93% rename from src/declarative/scenegraph/util/qsgtexturematerial.h rename to src/quick/scenegraph/util/qsgtexturematerial.h index be6ba7a8ab..b2b3ce6374 100644 --- a/src/declarative/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -42,17 +42,14 @@ #ifndef TEXTUREMATERIAL_H #define TEXTUREMATERIAL_H -#include "qsgmaterial.h" -#include +#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - -class Q_DECLARATIVE_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial +class Q_QUICK_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial { public: QSGOpaqueTextureMaterial(); @@ -88,7 +85,7 @@ class Q_DECLARATIVE_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial }; -class Q_DECLARATIVE_EXPORT QSGTextureMaterial : public QSGOpaqueTextureMaterial +class Q_QUICK_EXPORT QSGTextureMaterial : public QSGOpaqueTextureMaterial { public: virtual QSGMaterialType *type() const; diff --git a/src/declarative/scenegraph/util/qsgtexturematerial_p.h b/src/quick/scenegraph/util/qsgtexturematerial_p.h similarity index 95% rename from src/declarative/scenegraph/util/qsgtexturematerial_p.h rename to src/quick/scenegraph/util/qsgtexturematerial_p.h index a549f841d8..0ab552f4e9 100644 --- a/src/declarative/scenegraph/util/qsgtexturematerial_p.h +++ b/src/quick/scenegraph/util/qsgtexturematerial_p.h @@ -48,9 +48,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - -class Q_DECLARATIVE_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader +class Q_QUICK_EXPORT QSGOpaqueTextureMaterialShader : public QSGMaterialShader { public: virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect); diff --git a/src/declarative/scenegraph/util/qsgtextureprovider.cpp b/src/quick/scenegraph/util/qsgtextureprovider.cpp similarity index 100% rename from src/declarative/scenegraph/util/qsgtextureprovider.cpp rename to src/quick/scenegraph/util/qsgtextureprovider.cpp diff --git a/src/declarative/scenegraph/util/qsgtextureprovider_p.h b/src/quick/scenegraph/util/qsgtextureprovider_p.h similarity index 95% rename from src/declarative/scenegraph/util/qsgtextureprovider_p.h rename to src/quick/scenegraph/util/qsgtextureprovider_p.h index ebb6ca8507..bc4ffec03d 100644 --- a/src/declarative/scenegraph/util/qsgtextureprovider_p.h +++ b/src/quick/scenegraph/util/qsgtextureprovider_p.h @@ -49,9 +49,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - -class Q_DECLARATIVE_EXPORT QSGTextureProvider : public QObject +class Q_QUICK_EXPORT QSGTextureProvider : public QObject { Q_OBJECT public: diff --git a/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp similarity index 99% rename from src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp rename to src/quick/scenegraph/util/qsgvertexcolormaterial.cpp index 78cef55215..8c6996642b 100644 --- a/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp +++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp @@ -113,7 +113,7 @@ const char *QSGVertexColorMaterialShader::fragmentShader() const { \brief The QSGVertexColorMaterial class provides a convenient way of rendering per-vertex colored geometry in the scene graph. - \inmodule QtDeclarative + \inmodule QtQuick The vertex color material will give each vertex in a geometry a color. Pixels between vertices will be linearly interpolated. The colors can contain transparency. diff --git a/src/declarative/scenegraph/util/qsgvertexcolormaterial.h b/src/quick/scenegraph/util/qsgvertexcolormaterial.h similarity index 94% rename from src/declarative/scenegraph/util/qsgvertexcolormaterial.h rename to src/quick/scenegraph/util/qsgvertexcolormaterial.h index c244f63834..1d3b5a82e0 100644 --- a/src/declarative/scenegraph/util/qsgvertexcolormaterial.h +++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.h @@ -42,15 +42,13 @@ #ifndef VERTEXCOLORMATERIAL_H #define VERTEXCOLORMATERIAL_H -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - -class Q_DECLARATIVE_EXPORT QSGVertexColorMaterial : public QSGMaterial +class Q_QUICK_EXPORT QSGVertexColorMaterial : public QSGMaterial { public: QSGVertexColorMaterial(); diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/quick/util/qdeclarativeanimation.cpp similarity index 100% rename from src/declarative/util/qdeclarativeanimation.cpp rename to src/quick/util/qdeclarativeanimation.cpp diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/quick/util/qdeclarativeanimation_p.h similarity index 98% rename from src/declarative/util/qdeclarativeanimation_p.h rename to src/quick/util/qdeclarativeanimation_p.h index c84af5a53e..6c8f552888 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/quick/util/qdeclarativeanimation_p.h @@ -58,11 +58,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeAbstractAnimationPrivate; class QDeclarativeAnimationGroup; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus +class Q_QUICK_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeAbstractAnimation) @@ -164,7 +162,7 @@ class Q_AUTOTEST_EXPORT QDeclarativePauseAnimation : public QDeclarativeAbstract }; class QDeclarativeScriptActionPrivate; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation +class Q_QUICK_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeScriptAction) diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/quick/util/qdeclarativeanimation_p_p.h similarity index 100% rename from src/declarative/util/qdeclarativeanimation_p_p.h rename to src/quick/util/qdeclarativeanimation_p_p.h diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/quick/util/qdeclarativebehavior.cpp similarity index 100% rename from src/declarative/util/qdeclarativebehavior.cpp rename to src/quick/util/qdeclarativebehavior.cpp diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/quick/util/qdeclarativebehavior_p.h similarity index 94% rename from src/declarative/util/qdeclarativebehavior_p.h rename to src/quick/util/qdeclarativebehavior_p.h index 613461abb1..1f8873de22 100644 --- a/src/declarative/util/qdeclarativebehavior_p.h +++ b/src/quick/util/qdeclarativebehavior_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEBEHAVIOR_H #define QDECLARATIVEBEHAVIOR_H -#include +#include #include #include @@ -52,11 +52,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeAbstractAnimation; class QDeclarativeBehaviorPrivate; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor +class Q_QUICK_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeBehavior) diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/quick/util/qdeclarativebind.cpp similarity index 100% rename from src/declarative/util/qdeclarativebind.cpp rename to src/quick/util/qdeclarativebind.cpp diff --git a/src/declarative/util/qdeclarativebind_p.h b/src/quick/util/qdeclarativebind_p.h similarity index 99% rename from src/declarative/util/qdeclarativebind_p.h rename to src/quick/util/qdeclarativebind_p.h index 38f15a9328..dfb6103a37 100644 --- a/src/declarative/util/qdeclarativebind_p.h +++ b/src/quick/util/qdeclarativebind_p.h @@ -50,8 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeBindPrivate; class Q_AUTOTEST_EXPORT QDeclarativeBind : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus { diff --git a/src/declarative/util/qdeclarativechangeset.cpp b/src/quick/util/qdeclarativechangeset.cpp similarity index 100% rename from src/declarative/util/qdeclarativechangeset.cpp rename to src/quick/util/qdeclarativechangeset.cpp diff --git a/src/declarative/util/qdeclarativechangeset_p.h b/src/quick/util/qdeclarativechangeset_p.h similarity index 100% rename from src/declarative/util/qdeclarativechangeset_p.h rename to src/quick/util/qdeclarativechangeset_p.h diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/quick/util/qdeclarativeconnections.cpp similarity index 100% rename from src/declarative/util/qdeclarativeconnections.cpp rename to src/quick/util/qdeclarativeconnections.cpp diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/quick/util/qdeclarativeconnections_p.h similarity index 99% rename from src/declarative/util/qdeclarativeconnections_p.h rename to src/quick/util/qdeclarativeconnections_p.h index 86e1341689..bab29e5521 100644 --- a/src/declarative/util/qdeclarativeconnections_p.h +++ b/src/quick/util/qdeclarativeconnections_p.h @@ -52,8 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeBoundSignal; class QDeclarativeContext; class QDeclarativeConnectionsPrivate; diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/quick/util/qdeclarativefontloader.cpp similarity index 100% rename from src/declarative/util/qdeclarativefontloader.cpp rename to src/quick/util/qdeclarativefontloader.cpp diff --git a/src/declarative/util/qdeclarativefontloader_p.h b/src/quick/util/qdeclarativefontloader_p.h similarity index 99% rename from src/declarative/util/qdeclarativefontloader_p.h rename to src/quick/util/qdeclarativefontloader_p.h index 26cad5eff4..2511908a8e 100644 --- a/src/declarative/util/qdeclarativefontloader_p.h +++ b/src/quick/util/qdeclarativefontloader_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeFontLoaderPrivate; class Q_AUTOTEST_EXPORT QDeclarativeFontLoader : public QObject { diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/quick/util/qdeclarativelistaccessor.cpp similarity index 100% rename from src/declarative/util/qdeclarativelistaccessor.cpp rename to src/quick/util/qdeclarativelistaccessor.cpp diff --git a/src/declarative/util/qdeclarativelistaccessor_p.h b/src/quick/util/qdeclarativelistaccessor_p.h similarity index 99% rename from src/declarative/util/qdeclarativelistaccessor_p.h rename to src/quick/util/qdeclarativelistaccessor_p.h index f13dca8fcf..b9fcdd01d2 100644 --- a/src/declarative/util/qdeclarativelistaccessor_p.h +++ b/src/quick/util/qdeclarativelistaccessor_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeEngine; class Q_AUTOTEST_EXPORT QDeclarativeListAccessor { diff --git a/src/declarative/util/qdeclarativelistcompositor.cpp b/src/quick/util/qdeclarativelistcompositor.cpp similarity index 100% rename from src/declarative/util/qdeclarativelistcompositor.cpp rename to src/quick/util/qdeclarativelistcompositor.cpp diff --git a/src/declarative/util/qdeclarativelistcompositor_p.h b/src/quick/util/qdeclarativelistcompositor_p.h similarity index 100% rename from src/declarative/util/qdeclarativelistcompositor_p.h rename to src/quick/util/qdeclarativelistcompositor_p.h diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/quick/util/qdeclarativepackage.cpp similarity index 100% rename from src/declarative/util/qdeclarativepackage.cpp rename to src/quick/util/qdeclarativepackage.cpp diff --git a/src/declarative/util/qdeclarativepackage_p.h b/src/quick/util/qdeclarativepackage_p.h similarity index 99% rename from src/declarative/util/qdeclarativepackage_p.h rename to src/quick/util/qdeclarativepackage_p.h index 8ae88488d0..76797430ce 100644 --- a/src/declarative/util/qdeclarativepackage_p.h +++ b/src/quick/util/qdeclarativepackage_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativePackagePrivate; class QDeclarativePackageAttached; class Q_AUTOTEST_EXPORT QDeclarativePackage : public QObject diff --git a/src/declarative/util/qdeclarativepath.cpp b/src/quick/util/qdeclarativepath.cpp similarity index 100% rename from src/declarative/util/qdeclarativepath.cpp rename to src/quick/util/qdeclarativepath.cpp diff --git a/src/declarative/util/qdeclarativepath_p.h b/src/quick/util/qdeclarativepath_p.h similarity index 99% rename from src/declarative/util/qdeclarativepath_p.h rename to src/quick/util/qdeclarativepath_p.h index 537afb3b0b..afa5b0240e 100644 --- a/src/declarative/util/qdeclarativepath_p.h +++ b/src/quick/util/qdeclarativepath_p.h @@ -54,8 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeCurve; struct QDeclarativePathData { diff --git a/src/declarative/util/qdeclarativepath_p_p.h b/src/quick/util/qdeclarativepath_p_p.h similarity index 100% rename from src/declarative/util/qdeclarativepath_p_p.h rename to src/quick/util/qdeclarativepath_p_p.h diff --git a/src/declarative/util/qdeclarativepathinterpolator.cpp b/src/quick/util/qdeclarativepathinterpolator.cpp similarity index 100% rename from src/declarative/util/qdeclarativepathinterpolator.cpp rename to src/quick/util/qdeclarativepathinterpolator.cpp diff --git a/src/declarative/util/qdeclarativepathinterpolator_p.h b/src/quick/util/qdeclarativepathinterpolator_p.h similarity index 99% rename from src/declarative/util/qdeclarativepathinterpolator_p.h rename to src/quick/util/qdeclarativepathinterpolator_p.h index cb8ccfa8fb..11370a53fe 100644 --- a/src/declarative/util/qdeclarativepathinterpolator_p.h +++ b/src/quick/util/qdeclarativepathinterpolator_p.h @@ -49,8 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativePath; class Q_AUTOTEST_EXPORT QDeclarativePathInterpolator : public QObject { diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/quick/util/qdeclarativepixmapcache.cpp similarity index 99% rename from src/declarative/util/qdeclarativepixmapcache.cpp rename to src/quick/util/qdeclarativepixmapcache.cpp index b57bfac585..ba155abe98 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/quick/util/qdeclarativepixmapcache.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/quick/util/qdeclarativepixmapcache_p.h similarity index 98% rename from src/declarative/util/qdeclarativepixmapcache_p.h rename to src/quick/util/qdeclarativepixmapcache_p.h index a0e35aba5d..ee55519f93 100644 --- a/src/declarative/util/qdeclarativepixmapcache_p.h +++ b/src/quick/util/qdeclarativepixmapcache_p.h @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -54,8 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeEngine; class QDeclarativePixmapData; class QDeclarativeTextureFactory; @@ -78,7 +77,7 @@ class QDeclarativeDefaultTextureFactory : public QDeclarativeTextureFactory QImage im; }; -class Q_DECLARATIVE_EXPORT QDeclarativePixmap +class Q_QUICK_EXPORT QDeclarativePixmap { Q_DECLARE_TR_FUNCTIONS(QDeclarativePixmap) public: diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/quick/util/qdeclarativepropertychanges.cpp similarity index 100% rename from src/declarative/util/qdeclarativepropertychanges.cpp rename to src/quick/util/qdeclarativepropertychanges.cpp diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/quick/util/qdeclarativepropertychanges_p.h similarity index 96% rename from src/declarative/util/qdeclarativepropertychanges_p.h rename to src/quick/util/qdeclarativepropertychanges_p.h index 6d3e032b57..73f308874d 100644 --- a/src/declarative/util/qdeclarativepropertychanges_p.h +++ b/src/quick/util/qdeclarativepropertychanges_p.h @@ -49,10 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativePropertyChangesPrivate; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation +class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativePropertyChanges) diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/quick/util/qdeclarativesmoothedanimation.cpp similarity index 100% rename from src/declarative/util/qdeclarativesmoothedanimation.cpp rename to src/quick/util/qdeclarativesmoothedanimation.cpp diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/quick/util/qdeclarativesmoothedanimation_p.h similarity index 99% rename from src/declarative/util/qdeclarativesmoothedanimation_p.h rename to src/quick/util/qdeclarativesmoothedanimation_p.h index 9417383c1e..d4c7716540 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation_p.h +++ b/src/quick/util/qdeclarativesmoothedanimation_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeProperty; class QDeclarativeSmoothedAnimationPrivate; class Q_AUTOTEST_EXPORT QDeclarativeSmoothedAnimation : public QDeclarativeNumberAnimation diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/quick/util/qdeclarativesmoothedanimation_p_p.h similarity index 100% rename from src/declarative/util/qdeclarativesmoothedanimation_p_p.h rename to src/quick/util/qdeclarativesmoothedanimation_p_p.h diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/quick/util/qdeclarativespringanimation.cpp similarity index 100% rename from src/declarative/util/qdeclarativespringanimation.cpp rename to src/quick/util/qdeclarativespringanimation.cpp diff --git a/src/declarative/util/qdeclarativespringanimation_p.h b/src/quick/util/qdeclarativespringanimation_p.h similarity index 99% rename from src/declarative/util/qdeclarativespringanimation_p.h rename to src/quick/util/qdeclarativespringanimation_p.h index 14a34b47c5..13e983b9a5 100644 --- a/src/declarative/util/qdeclarativespringanimation_p.h +++ b/src/quick/util/qdeclarativespringanimation_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeSpringAnimationPrivate; class Q_AUTOTEST_EXPORT QDeclarativeSpringAnimation : public QDeclarativeNumberAnimation { diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/quick/util/qdeclarativestate.cpp similarity index 100% rename from src/declarative/util/qdeclarativestate.cpp rename to src/quick/util/qdeclarativestate.cpp diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/quick/util/qdeclarativestate_p.h similarity index 96% rename from src/declarative/util/qdeclarativestate_p.h rename to src/quick/util/qdeclarativestate_p.h index a7aafe32fe..79038e50ea 100644 --- a/src/declarative/util/qdeclarativestate_p.h +++ b/src/quick/util/qdeclarativestate_p.h @@ -46,19 +46,17 @@ #include #include #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeActionEvent; class QDeclarativeAbstractBinding; class QDeclarativeBinding; class QDeclarativeExpression; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAction +class Q_QUICK_PRIVATE_EXPORT QDeclarativeAction { public: QDeclarativeAction(); @@ -115,7 +113,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeActionEvent class QDeclarativeStateGroup; class QDeclarativeState; class QDeclarativeStateOperationPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeStateOperation : public QObject +class Q_QUICK_EXPORT QDeclarativeStateOperation : public QObject { Q_OBJECT public: @@ -140,7 +138,7 @@ typedef QDeclarativeStateOperation::ActionList QDeclarativeStateActions; class QDeclarativeTransition; class QDeclarativeStatePrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeState : public QObject +class Q_QUICK_EXPORT QDeclarativeState : public QObject { Q_OBJECT diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/quick/util/qdeclarativestate_p_p.h similarity index 100% rename from src/declarative/util/qdeclarativestate_p_p.h rename to src/quick/util/qdeclarativestate_p_p.h diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/quick/util/qdeclarativestategroup.cpp similarity index 100% rename from src/declarative/util/qdeclarativestategroup.cpp rename to src/quick/util/qdeclarativestategroup.cpp diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/quick/util/qdeclarativestategroup_p.h similarity index 96% rename from src/declarative/util/qdeclarativestategroup_p.h rename to src/quick/util/qdeclarativestategroup_p.h index c59325580b..0ddc3db312 100644 --- a/src/declarative/util/qdeclarativestategroup_p.h +++ b/src/quick/util/qdeclarativestategroup_p.h @@ -48,10 +48,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeStateGroupPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus +class Q_QUICK_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/quick/util/qdeclarativestateoperations.cpp similarity index 100% rename from src/declarative/util/qdeclarativestateoperations.cpp rename to src/quick/util/qdeclarativestateoperations.cpp diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/quick/util/qdeclarativestateoperations_p.h similarity index 99% rename from src/declarative/util/qdeclarativestateoperations_p.h rename to src/quick/util/qdeclarativestateoperations_p.h index 4975a5226f..872a296025 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/quick/util/qdeclarativestateoperations_p.h @@ -49,9 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class QDeclarativeStateChangeScriptPrivate; class Q_AUTOTEST_EXPORT QDeclarativeStateChangeScript : public QDeclarativeStateOperation, public QDeclarativeActionEvent { diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/quick/util/qdeclarativestyledtext.cpp similarity index 100% rename from src/declarative/util/qdeclarativestyledtext.cpp rename to src/quick/util/qdeclarativestyledtext.cpp diff --git a/src/declarative/util/qdeclarativestyledtext_p.h b/src/quick/util/qdeclarativestyledtext_p.h similarity index 100% rename from src/declarative/util/qdeclarativestyledtext_p.h rename to src/quick/util/qdeclarativestyledtext_p.h diff --git a/src/declarative/util/qdeclarativesvgparser.cpp b/src/quick/util/qdeclarativesvgparser.cpp similarity index 100% rename from src/declarative/util/qdeclarativesvgparser.cpp rename to src/quick/util/qdeclarativesvgparser.cpp diff --git a/src/declarative/util/qdeclarativesvgparser_p.h b/src/quick/util/qdeclarativesvgparser_p.h similarity index 100% rename from src/declarative/util/qdeclarativesvgparser_p.h rename to src/quick/util/qdeclarativesvgparser_p.h diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/quick/util/qdeclarativesystempalette.cpp similarity index 100% rename from src/declarative/util/qdeclarativesystempalette.cpp rename to src/quick/util/qdeclarativesystempalette.cpp diff --git a/src/declarative/util/qdeclarativesystempalette_p.h b/src/quick/util/qdeclarativesystempalette_p.h similarity index 99% rename from src/declarative/util/qdeclarativesystempalette_p.h rename to src/quick/util/qdeclarativesystempalette_p.h index e92dc514d5..25224fd4d1 100644 --- a/src/declarative/util/qdeclarativesystempalette_p.h +++ b/src/quick/util/qdeclarativesystempalette_p.h @@ -51,8 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeSystemPalettePrivate; class Q_AUTOTEST_EXPORT QDeclarativeSystemPalette : public QObject { diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/quick/util/qdeclarativetimeline.cpp similarity index 100% rename from src/declarative/util/qdeclarativetimeline.cpp rename to src/quick/util/qdeclarativetimeline.cpp diff --git a/src/declarative/util/qdeclarativetimeline_p_p.h b/src/quick/util/qdeclarativetimeline_p_p.h similarity index 100% rename from src/declarative/util/qdeclarativetimeline_p_p.h rename to src/quick/util/qdeclarativetimeline_p_p.h diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/quick/util/qdeclarativetimer.cpp similarity index 100% rename from src/declarative/util/qdeclarativetimer.cpp rename to src/quick/util/qdeclarativetimer.cpp diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/quick/util/qdeclarativetimer_p.h similarity index 95% rename from src/declarative/util/qdeclarativetimer_p.h rename to src/quick/util/qdeclarativetimer_p.h index 7de56068dd..acf728236d 100644 --- a/src/declarative/util/qdeclarativetimer_p.h +++ b/src/quick/util/qdeclarativetimer_p.h @@ -47,16 +47,14 @@ #include #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeTimerPrivate; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus +class Q_QUICK_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeTimer) diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/quick/util/qdeclarativetransition.cpp similarity index 100% rename from src/declarative/util/qdeclarativetransition.cpp rename to src/quick/util/qdeclarativetransition.cpp diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/quick/util/qdeclarativetransition_p.h similarity index 97% rename from src/declarative/util/qdeclarativetransition_p.h rename to src/quick/util/qdeclarativetransition_p.h index a53346e148..439458b6af 100644 --- a/src/declarative/util/qdeclarativetransition_p.h +++ b/src/quick/util/qdeclarativetransition_p.h @@ -52,12 +52,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeAbstractAnimation; class QDeclarativeTransitionPrivate; class QDeclarativeTransitionManager; -class Q_DECLARATIVE_EXPORT QDeclarativeTransition : public QObject +class Q_QUICK_EXPORT QDeclarativeTransition : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeTransition) diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/quick/util/qdeclarativetransitionmanager.cpp similarity index 100% rename from src/declarative/util/qdeclarativetransitionmanager.cpp rename to src/quick/util/qdeclarativetransitionmanager.cpp diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/quick/util/qdeclarativetransitionmanager_p_p.h similarity index 100% rename from src/declarative/util/qdeclarativetransitionmanager_p_p.h rename to src/quick/util/qdeclarativetransitionmanager_p_p.h diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/quick/util/qdeclarativeutilmodule.cpp similarity index 100% rename from src/declarative/util/qdeclarativeutilmodule.cpp rename to src/quick/util/qdeclarativeutilmodule.cpp diff --git a/src/declarative/util/qdeclarativeutilmodule_p.h b/src/quick/util/qdeclarativeutilmodule_p.h similarity index 98% rename from src/declarative/util/qdeclarativeutilmodule_p.h rename to src/quick/util/qdeclarativeutilmodule_p.h index 7304f6fd77..13739c8170 100644 --- a/src/declarative/util/qdeclarativeutilmodule_p.h +++ b/src/quick/util/qdeclarativeutilmodule_p.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - class QDeclarativeUtilModule { public: diff --git a/src/quick/util/util.pri b/src/quick/util/util.pri new file mode 100644 index 0000000000..9c8964bfef --- /dev/null +++ b/src/quick/util/util.pri @@ -0,0 +1,59 @@ +SOURCES += \ + $$PWD/qdeclarativeutilmodule.cpp\ + $$PWD/qdeclarativeconnections.cpp \ + $$PWD/qdeclarativepackage.cpp \ + $$PWD/qdeclarativeanimation.cpp \ + $$PWD/qdeclarativesystempalette.cpp \ + $$PWD/qdeclarativespringanimation.cpp \ + $$PWD/qdeclarativesmoothedanimation.cpp \ + $$PWD/qdeclarativestate.cpp\ + $$PWD/qdeclarativetransitionmanager.cpp \ + $$PWD/qdeclarativestateoperations.cpp \ + $$PWD/qdeclarativepropertychanges.cpp \ + $$PWD/qdeclarativestategroup.cpp \ + $$PWD/qdeclarativetransition.cpp \ + $$PWD/qdeclarativelistaccessor.cpp \ + $$PWD/qdeclarativetimeline.cpp \ + $$PWD/qdeclarativetimer.cpp \ + $$PWD/qdeclarativebind.cpp \ + $$PWD/qdeclarativepixmapcache.cpp \ + $$PWD/qdeclarativebehavior.cpp \ + $$PWD/qdeclarativefontloader.cpp \ + $$PWD/qdeclarativestyledtext.cpp \ + $$PWD/qdeclarativepath.cpp \ + $$PWD/qdeclarativechangeset.cpp \ + $$PWD/qdeclarativelistcompositor.cpp \ + $$PWD/qdeclarativepathinterpolator.cpp \ + $$PWD/qdeclarativesvgparser.cpp + +HEADERS += \ + $$PWD/qdeclarativeutilmodule_p.h\ + $$PWD/qdeclarativeconnections_p.h \ + $$PWD/qdeclarativepackage_p.h \ + $$PWD/qdeclarativeanimation_p.h \ + $$PWD/qdeclarativeanimation_p_p.h \ + $$PWD/qdeclarativesystempalette_p.h \ + $$PWD/qdeclarativespringanimation_p.h \ + $$PWD/qdeclarativesmoothedanimation_p.h \ + $$PWD/qdeclarativesmoothedanimation_p_p.h \ + $$PWD/qdeclarativestate_p.h\ + $$PWD/qdeclarativestateoperations_p.h \ + $$PWD/qdeclarativepropertychanges_p.h \ + $$PWD/qdeclarativestate_p_p.h\ + $$PWD/qdeclarativetransitionmanager_p_p.h \ + $$PWD/qdeclarativestategroup_p.h \ + $$PWD/qdeclarativetransition_p.h \ + $$PWD/qdeclarativelistaccessor_p.h \ + $$PWD/qdeclarativetimeline_p_p.h \ + $$PWD/qdeclarativetimer_p.h \ + $$PWD/qdeclarativebind_p.h \ + $$PWD/qdeclarativepixmapcache_p.h \ + $$PWD/qdeclarativebehavior_p.h \ + $$PWD/qdeclarativefontloader_p.h \ + $$PWD/qdeclarativestyledtext_p.h \ + $$PWD/qdeclarativepath_p.h \ + $$PWD/qdeclarativepath_p_p.h \ + $$PWD/qdeclarativechangeset_p.h \ + $$PWD/qdeclarativelistcompositor_p.h \ + $$PWD/qdeclarativepathinterpolator_p.h \ + $$PWD/qdeclarativesvgparser_p.h diff --git a/src/src.pro b/src/src.pro index 3f71db2472..7518ccf8da 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += declarative qtquick1 plugins +SUBDIRS += declarative quick qtquick1 plugins contains(QT_CONFIG, qmltest): SUBDIRS += qmltest diff --git a/sync.profile b/sync.profile index 55c3cdbad3..1b49f58b56 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,6 @@ %modules = ( # path to module name map "QtDeclarative" => "$basedir/src/declarative", + "QtQuick" => "$basedir/src/quick", "QtQuick1" => "$basedir/src/qtquick1", "QtQuickTest" => "$basedir/src/qmltest", "QtQmlDevTools" => "$basedir/src/qmldevtools", @@ -18,10 +19,92 @@ ); %modulepris = ( "QtDeclarative" => "$basedir/modules/qt_declarative.pri", + "QtQuick" => "$basedir/modules/qt_quick.pri", "QtQuick1" => "$basedir/modules/qt_qtquick1.pri", "QtQuickTest" => "$basedir/modules/qt_qmltest.pri", "QtQmlDevTools" => "$basedir/modules/qt_qmldevtools.pri", ); +%deprecatedheaders = ( + "QtDeclarative" => { + "qquickcanvas.h" => "QtQuick/qquickcanvas.h", + "qquickitem.h" => "QtQuick/qquickitem.h", + "qquickpainteditem.h" => "QtQuick/qquickpainteditem.h", + "qquickview.h" => "QtQuick/qquickview.h", + "QQuickCanvas" => "QtQuick/QQuickCanvas", + "QQuickItem" => "QtQuick/QQuickItem", + "QQuickPaintedItem" => "QtQuick/QQuickPaintedItem", + "QQuickView" => "QtQuick/QQuickView", + "QQuickTransform" => "QtQuick/QQuickTransform", + "designersupport.h" => "QtQuick/designersupport.h", + "qsgengine.h" => "QtQuick/qsgengine.h", + "qsgflatcolormaterial.h" => "QtQuick/qsgflatcolormaterial.h", + "qsggeometry.h" => "QtQuick/qsggeometry.h", + "qsgmaterial.h" => "QtQuick/qsgmaterial.h", + "qsgnode.h" => "QtQuick/qsgnode.h", + "qsgsimplematerial.h" => "QtQuick/qsgsimplematerial.h", + "qsgsimplerectnode.h" => "QtQuick/qsgsimplerectnode.h", + "qsgsimpletexturenode.h" => "QtQuick/qsgsimpletexturenode.h", + "qsgtexture.h" => "QtQuick/qsgtexture.h", + "qsgtexturematerial.h" => "QtQuick/qsgtexturematerial.h", + "qsgvertexcolormaterial.h" => "QtQuick/qsgvertexcolormaterial.h", + "QSGBasicGeometryNode" => "QtQuick/QSGBasicGeometryNode", + "QSGClipNode" => "QtQuick/QSGClipNode", + "QSGDynamicTexture" => "QtQuick/QSGDynamicTexture", + "QSGEngine" => "QtQuick/QSGEngine", + "QSGFlatColorMaterial" => "QtQuick/QSGFlatColorMaterial", + "QSGGeometry" => "QtQuick/QSGGeometry", + "QSGGeometryNode" => "QtQuick/QSGGeometryNode", + "QSGMaterial" => "QtQuick/QSGMaterial", + "QSGMaterialShader" => "QtQuick/QSGMaterialShader", + "QSGMaterialType" => "QtQuick/QSGMaterialType", + "QSGNode" => "QtQuick/QSGNode", + "QSGNodeVisitor" => "QtQuick/QSGNodeVisitor", + "QSGOpacityNode" => "QtQuick/QSGOpacityNode", + "QSGOpaqueTextureMaterial" => "QtQuick/QSGOpaqueTextureMaterial", + "QSGRootNode" => "QtQuick/QSGRootNode", + "QSGSimpleMaterial" => "QtQuick/QSGSimpleMaterial", + "QSGSimpleMaterialComparableMaterial" => "QtQuick/QSGSimpleMaterialComparableMaterial", + "QSGSimpleMaterialShader" => "QtQuick/QSGSimpleMaterialShader", + "QSGSimpleRectNode" => "QtQuick/QSGSimpleRectNode", + "QSGSimpleTextureNode" => "QtQuick/QSGSimpleTextureNode", + "QSGTexture" => "QtQuick/QSGTexture", + "QSGTextureMaterial" => "QtQuick/QSGTextureMaterial", + "QSGTransformNode" => "QtQuick/QSGTransformNode", + "QSGVertexColorMaterial" => "QtQuick/QSGVertexColorMaterial", + "qquickanchors_p.h" => "QtQuick/private/qquickanchors_p.h", + "qquickcanvasitem_p.h" => "QtQuick/private/qquickcanvasitem_p.h", + "qquickcontext2d_p.h" => "QtQuick/private/qquickcontext2d_p.h", + "qquickevents_p_p.h" => "QtQuick/private/qquickevents_p_p.h", + "qquickmousearea_p.h" => "QtQuick/private/qquickmousearea_p.h", + "qquickpositioners_p.h" => "QtQuick/private/qquickpositioners_p.h", + "qquickrectangle_p.h" => "QtQuick/private/qquickrectangle_p.h", + "qquickscalegrid_p.h" => "QtQuick/private/qquickscalegrid_p.h", + "qquickshadereffectmesh_p.h" => "QtQuick/private/qquickshadereffectmesh_p.h", + "qquickshadereffectsource_p.h" => "QtQuick/private/qquickshadereffectsource_p.h", + "qquicktext_p.h" => "QtQuick/private/qquicktext_p.h", + "qquickvisualdatamodel_p.h" => "QtQuick/private/qquickvisualdatamodel_p.h", + "qsgnodeupdater_p.h" => "QtQuick/private/qsgnodeupdater_p.h", + "qsgrenderer_p.h" => "QtQuick/private/qsgrenderer_p.h", + "qsgadaptionlayer_p.h" => "QtQuick/private/qsgadaptionlayer_p.h", + "qsgcontext_p.h" => "QtQuick/private/qsgcontext_p.h", + "qsgcontextplugin_p.h" => "QtQuick/private/qsgcontextplugin_p.h", + "qsgdefaultdistancefieldglyphcache_p.h" => "QtQuick/private/qsgdefaultdistancefieldglyphcache_p.h", + "qsgareaallocator_p.h" => "QtQuick/private/qsgareaallocator_p.h", + "qsgdistancefieldutil_p.h" => "QtQuick/private/qsgdistancefieldutil_p.h", + "qsgpainternode_p.h" => "QtQuick/private/qsgpainternode_p.h", + "qsgtexture_p.h" => "QtQuick/private/qsgtexture_p.h", + "qsgtexturematerial_p.h" => "QtQuick/private/qsgtexturematerial_p.h", + "qsgtextureprovider_p.h" => "QtQuick/private/qsgtextureprovider_p.h", + "qdeclarativeanimation_p.h" => "QtQuick/private/qdeclarativeanimation_p.h", + "qdeclarativebehavior_p.h" => "QtQuick/private/qdeclarativebehavior_p.h", + "qdeclarativepixmapcache_p.h" => "QtQuick/private/qdeclarativepixmapcache_p.h", + "qdeclarativepropertychanges_p.h" => "QtQuick/private/qdeclarativepropertychanges_p.h", + "qdeclarativestate_p.h" => "QtQuick/private/qdeclarativestate_p.h", + "qdeclarativestategroup_p.h" => "QtQuick/private/qdeclarativestategroup_p.h", + "qdeclarativetimer_p.h" => "QtQuick/private/qdeclarativetimer_p.h", + "qdeclarativetransition_p.h" => "QtQuick/private/qdeclarativetransition_p.h", + } +); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c3ec7231cc..c4ed5aeee8 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,6 +1,7 @@ TEMPLATE=subdirs SUBDIRS=\ declarative \ + qtquick2 \ particles # ### refactor: port properly diff --git a/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp index 105700eedc..8967b844df 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -51,7 +51,7 @@ //QDeclarativeDebugTest #include "../shared/debugutil_p.h" -#include "../../shared/util.h" +#include "../../../shared/util.h" const char *SEQ = "seq"; const char *TYPE = "type"; diff --git a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 21aeca9040..6754503de9 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -50,7 +50,7 @@ #include #include -#include "../../shared/util.h" +#include "../../../shared/util.h" #include "../shared/debugutil_p.h" #define PORT 13769 diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp b/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp index fc2f0d6626..3b5311e617 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp @@ -44,7 +44,7 @@ #include "QtDeclarative/private/qdeclarativedebugtrace_p.h" #include "../shared/debugutil_p.h" -#include "../../shared/util.h" +#include "../../../shared/util.h" #define PORT 13773 #define STR_PORT "13773" diff --git a/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro b/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro index 4805f37e55..6b414d3c32 100644 --- a/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro +++ b/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro @@ -8,4 +8,4 @@ SOURCES += tst_qdeclarativeenginedebug.cpp \ CONFIG += parallel_test declarative_debug -QT += core-private declarative-private v8-private testlib +QT += core-private declarative-private quick-private v8-private testlib diff --git a/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp index f48b281d3a..d5e4696936 100644 --- a/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp +++ b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro b/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro index 7b6783b112..90595df881 100644 --- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro +++ b/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro @@ -1,5 +1,5 @@ TARGET = app -QT += declarative widgets qtquick1 +QT += declarative quick widgets qtquick1 CONFIG += declarative_debug macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp b/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp index c851222461..67d0a4499e 100644 --- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp +++ b/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include diff --git a/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp b/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp index 00ed1317a0..0739c746b9 100644 --- a/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp +++ b/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp @@ -44,7 +44,7 @@ #include "QtDeclarative/private/qv8profilerservice_p.h" #include "../shared/debugutil_p.h" -#include "../../shared/util.h" +#include "../../../shared/util.h" #define PORT 13774 #define STR_PORT "13774" diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 708127289b..8e52392941 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -4,9 +4,6 @@ METATYPETESTS += \ qdeclarativemetatype PUBLICTESTS += \ - examples \ - geometry \ - nodes \ parserstress \ qdeclarativecomponent \ qdeclarativeconsole \ @@ -19,7 +16,6 @@ PUBLICTESTS += \ qdeclarativelistreference \ qdeclarativelocale \ qdeclarativemoduleplugin \ - qdeclarativepixmapcache \ qdeclarativeqt \ qdeclarativetranslation \ qdeclarativexmlhttprequest \ @@ -30,76 +26,28 @@ PUBLICTESTS += \ qmlplugindump PRIVATETESTS += \ - qdeclarativeanimations \ - qdeclarativeapplication \ - qdeclarativebehaviors \ qdeclarativebinding \ qdeclarativechangeset \ qdeclarativeconnection \ qdeclarativecpputils \ qdeclarativeecmascript \ qdeclarativeexpression \ - qdeclarativefontloader \ qdeclarativeimageprovider \ qdeclarativeinstruction \ qdeclarativelanguage \ qdeclarativelistcompositor \ qdeclarativelistmodel \ - qdeclarativepath \ qdeclarativeproperty \ qdeclarativepropertymap \ - qdeclarativesmoothedanimation \ - qdeclarativespringanimation \ qdeclarativesqldatabase \ - qdeclarativestates \ - qdeclarativestyledtext \ - qdeclarativesystempalette \ - qdeclarativetimer \ qdeclarativevaluetypes \ qdeclarativeworkerscript \ - qdeclarativexmllistmodel \ v4 -# This test requires the xmlpatterns module -!contains(QT_CONFIG,xmlpatterns):PRIVATETESTS -= qdeclarativexmllistmodel - -QUICKTESTS = \ - qquickanchors \ - qquickanimatedimage \ - qquickborderimage \ - qquickcanvas \ - qquickcanvasitem \ - qquickdrag \ - qquickdroparea \ - qquickflickable \ - qquickflipable \ - qquickfocusscope \ - qquickgridview \ - qquickimage \ - qquickitem \ - qquickitem2 \ - qquicklistview \ - qquickloader \ - qquickmousearea \ - qquickmultipointtoucharea \ - qquickpathview \ - qquickpincharea \ - qquickpositioners \ - qquickrepeater \ - qquickshadereffect \ - qquickspriteimage \ - qquicktext \ - qquicktextedit \ - qquicktextinput \ - qquickview \ - qquickvisualdatamodel \ - - SUBDIRS += $$PUBLICTESTS SUBDIRS += $$METATYPETESTS SUBDIRS += debugger contains(QT_CONFIG, private_tests) { SUBDIRS += $$PRIVATETESTS - SUBDIRS += $$QUICKTESTS } diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro index d0bbfe6faa..5f8ee634f4 100644 --- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp index 091a87b5a8..80ed10cd25 100644 --- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp +++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp @@ -42,8 +42,8 @@ #include #include #include -#include -#include "../shared/util.h" +#include +#include "../../shared/util.h" class tst_qdeclarativebinding : public QObject { diff --git a/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro b/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro index b2f88b630b..7c52ef5dfd 100644 --- a/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro +++ b/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro @@ -6,4 +6,4 @@ SOURCES += tst_qdeclarativechangeset.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp index 1dcaaa1b06..da15458d27 100644 --- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp +++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp @@ -43,11 +43,10 @@ #include #include -#include #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class MyIC : public QObject, public QDeclarativeIncubationController { diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro index ef3ef536f0..702f3fc542 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index 450f16c036..cd8f7b7b0c 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -43,7 +43,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include class tst_qdeclarativeconnection : public QObject diff --git a/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp b/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp index 24095e3c35..0025798854 100644 --- a/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp +++ b/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp @@ -42,7 +42,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeconsole : public QObject { diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp index ba9db4f875..c57cbeceba 100644 --- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp +++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp @@ -46,7 +46,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index d6d17c5869..1908e6bae1 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -4,10 +4,10 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ testtypes.cpp \ - ../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp HEADERS += testtypes.h \ - ../shared/testhttpserver.h -INCLUDEPATH += ../shared + ../../shared/testhttpserver.h +INCLUDEPATH += ../../shared # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 4891e5088e..3d50d6ee3d 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -54,7 +54,7 @@ #include #include "testtypes.h" #include "testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/util.h" /* This test covers evaluation of ECMAScript expressions and bindings from within diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp index ab97d04d4c..8fab5e5e50 100644 --- a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp +++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp @@ -42,7 +42,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeerror : public QObject { diff --git a/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp b/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp index a65045b48f..f7699e2bac 100644 --- a/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp +++ b/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp @@ -44,7 +44,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeexpression : public QObject { diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp index f8c91e6000..f85a6f14b6 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp @@ -46,7 +46,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" // From qdeclarastivefolderlistmodel.h const int FileNameRole = Qt::UserRole+1; diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro deleted file mode 100644 index 3efde621b2..0000000000 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qdeclarativefontloader -macx:CONFIG -= app_bundle - -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativefontloader.cpp ../../declarative/shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index dda2595956..70b9a406b3 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -6,4 +6,4 @@ SOURCES += tst_qdeclarativeimageprovider.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp index fe618b87e8..599b5d21b1 100644 --- a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp +++ b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp @@ -51,7 +51,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp index ec04a83102..d4e3df2ffb 100644 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp @@ -45,7 +45,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeinfo : public QObject { diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro index 105e2b44d6..f79d1c99c9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro +++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro @@ -6,9 +6,9 @@ SOURCES += tst_qdeclarativelanguage.cpp \ testtypes.cpp HEADERS += testtypes.h -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h -SOURCES += ../shared/testhttpserver.cpp +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp importFiles.files = data importFiles.path = . diff --git a/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro b/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro index e8dd7dd83a..3936f4beff 100644 --- a/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro +++ b/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro @@ -6,4 +6,4 @@ SOURCES += tst_qdeclarativelistcompositor.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index fc8a3178ae..ae3aa9d287 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 661b086fd1..1de2a2868e 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include #include #include @@ -51,7 +51,7 @@ #include #include -#include "../shared/util.h" +#include "../../shared/util.h" Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp index a86e66de45..e09db2c9c7 100644 --- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp +++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp @@ -49,7 +49,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp b/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp index 54139a2671..b2f35fd8b3 100644 --- a/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp +++ b/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp @@ -43,10 +43,9 @@ #include #include -#include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativelocale : public QObject { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index d8b7cf4e5b..1530eb9d36 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -44,8 +44,8 @@ #include #include -#include "../shared/testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/testhttpserver.h" +#include "../../shared/util.h" #define SERVER_ADDR "http://127.0.0.1:14450" #define SERVER_PORT 14450 diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro index 94c0f9dde1..bec727f05f 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro @@ -1,9 +1,9 @@ CONFIG += testcase TARGET = tst_qdeclarativemoduleplugin -HEADERS = ../shared/testhttpserver.h +HEADERS = ../../shared/testhttpserver.h SOURCES = tst_qdeclarativemoduleplugin.cpp \ - ../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp index 411eeeacc7..b1aad3a34b 100644 --- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp +++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp @@ -47,7 +47,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro index a6332161a0..f94405c770 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro +++ b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro @@ -6,4 +6,4 @@ SOURCES += tst_qdeclarativepropertymap.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp index cb2db47800..59a7fe7931 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp +++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include class tst_QDeclarativePropertyMap : public QObject diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 18fb8b2027..9428746dc1 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index 293fcd382f..5b3ea5e169 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -50,9 +50,9 @@ #include #include #include -#include +#include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeqt : public QObject { diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index 2d0efec9a5..8b8c19c44c 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -10,4 +10,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private sql testlib +QT += core-private gui-private v8-private declarative-private quick-private sql testlib diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp index f7c520d283..1a6b08cb79 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp +++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include /* @@ -53,7 +53,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativesqldatabase : public QObject { diff --git a/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp b/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp index be257fdc41..da84167148 100644 --- a/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp +++ b/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp @@ -43,7 +43,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativetranslation : public QObject { diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp index db0e05bcf2..c6880b96ce 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp +++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp @@ -44,7 +44,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include "testtypes.h" QT_BEGIN_NAMESPACE diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp index eb3413ec10..7dccbb35a0 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp +++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp @@ -50,7 +50,7 @@ #include #include -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index 0e6073b503..5715f3c114 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -2,11 +2,11 @@ CONFIG += testcase TARGET = tst_qdeclarativexmlhttprequest macx:CONFIG -= app_bundle -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qdeclarativexmlhttprequest.cpp \ - ../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp index 1caec581cc..da5431c50b 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp @@ -45,7 +45,7 @@ #include #include #include "testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/util.h" #define SERVER_PORT 14445 diff --git a/tests/auto/declarative/qmlmin/tst_qmlmin.cpp b/tests/auto/declarative/qmlmin/tst_qmlmin.cpp index 53b0e3772a..1c4f72191b 100644 --- a/tests/auto/declarative/qmlmin/tst_qmlmin.cpp +++ b/tests/auto/declarative/qmlmin/tst_qmlmin.cpp @@ -94,7 +94,7 @@ void tst_qmlmin::initTestCase() excludedDirs << "doc/src/snippets/qtquick1/imports"; // Add invalid files (i.e. files with syntax errors) - invalidFiles << "tests/auto/declarative/qquickloader/data/InvalidSourceComponent.qml"; + invalidFiles << "tests/auto/qtquick2/qquickloader/data/InvalidSourceComponent.qml"; invalidFiles << "tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml"; invalidFiles << "tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml"; invalidFiles << "tests/auto/declarative/qdeclarativelanguage/data/property.4.qml"; diff --git a/tests/auto/declarative/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/declarative/qquickanimatedimage/qquickanimatedimage.pro deleted file mode 100644 index d6a40e11ce..0000000000 --- a/tests/auto/declarative/qquickanimatedimage/qquickanimatedimage.pro +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickanimatedimage -HEADERS += ../shared/testhttpserver.h -SOURCES += tst_qquickanimatedimage.cpp ../shared/testhttpserver.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qquickborderimage/qquickborderimage.pro b/tests/auto/declarative/qquickborderimage/qquickborderimage.pro deleted file mode 100644 index b1ccf4a939..0000000000 --- a/tests/auto/declarative/qquickborderimage/qquickborderimage.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickborderimage -macx:CONFIG -= app_bundle - -HEADERS += ../shared/testhttpserver.h -SOURCES += tst_qquickborderimage.cpp ../shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private network widgets testlib diff --git a/tests/auto/declarative/qquickimage/qquickimage.pro b/tests/auto/declarative/qquickimage/qquickimage.pro deleted file mode 100644 index 46cbdb49aa..0000000000 --- a/tests/auto/declarative/qquickimage/qquickimage.pro +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickimage -macx:CONFIG -= app_bundle - -HEADERS += ../shared/testhttpserver.h -SOURCES += tst_qquickimage.cpp ../shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qquickmousearea/qquickmousearea.pro b/tests/auto/declarative/qquickmousearea/qquickmousearea.pro deleted file mode 100644 index 3581a7b9c9..0000000000 --- a/tests/auto/declarative/qquickmousearea/qquickmousearea.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickmousearea -macx:CONFIG -= app_bundle - -HEADERS += ../shared/testhttpserver.h -SOURCES += tst_qquickmousearea.cpp ../shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qquicktext/qquicktext.pro b/tests/auto/declarative/qquicktext/qquicktext.pro deleted file mode 100644 index fe69f75746..0000000000 --- a/tests/auto/declarative/qquicktext/qquicktext.pro +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquicktext -macx:CONFIG -= app_bundle - -SOURCES += tst_qquicktext.cpp - -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h -SOURCES += ../shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private v8-private declarative-private widgets-private opengl-private network testlib diff --git a/tests/auto/declarative/qquicktextedit/qquicktextedit.pro b/tests/auto/declarative/qquicktextedit/qquicktextedit.pro deleted file mode 100644 index ae2233dafc..0000000000 --- a/tests/auto/declarative/qquicktextedit/qquicktextedit.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquicktextedit -macx:CONFIG -= app_bundle - -SOURCES += tst_qquicktextedit.cpp ../shared/testhttpserver.cpp -HEADERS += ../shared/testhttpserver.h - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private network widgets-private testlib diff --git a/tests/auto/declarative/v4/tst_v4.cpp b/tests/auto/declarative/v4/tst_v4.cpp index 69fa4bbf0c..791610d541 100644 --- a/tests/auto/declarative/v4/tst_v4.cpp +++ b/tests/auto/declarative/v4/tst_v4.cpp @@ -48,7 +48,7 @@ #include -#include "../shared/util.h" +#include "../../shared/util.h" #include "testtypes.h" inline QUrl TEST_FILE(const QString &filename) diff --git a/tests/auto/particles/qquickage/qquickage.pro b/tests/auto/particles/qquickage/qquickage.pro index 980d390953..e03e3d47d1 100644 --- a/tests/auto/particles/qquickage/qquickage.pro +++ b/tests/auto/particles/qquickage/qquickage.pro @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro index 2a4ee5237a..235f0d81b0 100644 --- a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro +++ b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro index 160f63f3bc..09fe1aa06a 100644 --- a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro +++ b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro index e1293312b1..6d3ecaa6f4 100644 --- a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro +++ b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro index 3476a66ca2..e9bcc1e373 100644 --- a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro +++ b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro index 9f5147be33..803a366429 100644 --- a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro +++ b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickfriction/qquickfriction.pro b/tests/auto/particles/qquickfriction/qquickfriction.pro index d6726724ff..889b2d9505 100644 --- a/tests/auto/particles/qquickfriction/qquickfriction.pro +++ b/tests/auto/particles/qquickfriction/qquickfriction.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickgravity/qquickgravity.pro b/tests/auto/particles/qquickgravity/qquickgravity.pro index bc503d932a..3bdd8c1efa 100644 --- a/tests/auto/particles/qquickgravity/qquickgravity.pro +++ b/tests/auto/particles/qquickgravity/qquickgravity.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro index 14d28fd43d..fa43b28407 100644 --- a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro +++ b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro @@ -7,4 +7,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro index 8e8eadd463..9d78c2b49d 100644 --- a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro +++ b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles CONFIG += insignificant_test #temporary -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro index 255c9a4104..fae5203961 100644 --- a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro +++ b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro index b53d3610fa..d82adf8b4a 100644 --- a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro +++ b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro index b100ffaf75..27547c16b1 100644 --- a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro +++ b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro index 65472e23f9..6fd13ec01e 100644 --- a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro +++ b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro index 13b512791a..a9d390aab8 100644 --- a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro +++ b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro index 6adab3d75d..04fe1617de 100644 --- a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro +++ b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro index fee29efcf3..e45c43a587 100644 --- a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro +++ b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro index 0de6007283..0a887d1fb3 100644 --- a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro +++ b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro index 7b8075d625..9139dd39fb 100644 --- a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro +++ b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickturbulence/qquickturbulence.pro b/tests/auto/particles/qquickturbulence/qquickturbulence.pro index 405e8a6f2a..16d85445f5 100644 --- a/tests/auto/particles/qquickturbulence/qquickturbulence.pro +++ b/tests/auto/particles/qquickturbulence/qquickturbulence.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickwander/qquickwander.pro b/tests/auto/particles/qquickwander/qquickwander.pro index cf6f08e2dc..a9c48ece78 100644 --- a/tests/auto/particles/qquickwander/qquickwander.pro +++ b/tests/auto/particles/qquickwander/qquickwander.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h index ab6b5f16af..5989efe937 100644 --- a/tests/auto/particles/shared/particlestestsshared.h +++ b/tests/auto/particles/shared/particlestestsshared.h @@ -41,7 +41,7 @@ #ifndef PARTICLES_TESTS_SHARED #define PARTICLES_TESTS_SHARED -#include +#include #include #include const qreal EPSILON = 0.0001; diff --git a/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro index c5ec23e17e..21c846b4eb 100644 --- a/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro +++ b/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimatedimage -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativeanimatedimage.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativeanimatedimage.cpp ../../shared/testhttpserver.cpp macx:CONFIG -= app_bundle DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp index 275b8d0fb4..3d81d669f4 100644 --- a/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp +++ b/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp @@ -48,7 +48,7 @@ #include #include -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" class tst_qdeclarativeanimatedimage : public QObject { diff --git a/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro index 83319faf8a..a8c8b18a37 100644 --- a/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeborderimage macx:CONFIG -= app_bundle -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativeborderimage.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativeborderimage.cpp ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp index 4b82fe0a4e..4346c75850 100644 --- a/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp +++ b/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp @@ -54,7 +54,7 @@ #include #include -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #define SERVER_PORT 14446 #define SERVER_ADDR "http://127.0.0.1:14446" diff --git a/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro index fc48544fa0..fbe72b072c 100644 --- a/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativefontloader macx:CONFIG -= app_bundle -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativefontloader.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativefontloader.cpp ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 3bcbe1b67c..addd6516f5 100644 --- a/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -44,7 +44,7 @@ #include #include #include -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #define SERVER_PORT 14448 diff --git a/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro index 5c9b9db5c8..28570ab093 100644 --- a/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeimage macx:CONFIG -= app_bundle -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativeimage.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativeimage.cpp ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp index e93c373bf1..107ba89c77 100644 --- a/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -54,7 +54,7 @@ #include #include -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #define SERVER_PORT 14451 #define SERVER_ADDR "http://127.0.0.1:14451" diff --git a/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro index 7f3cfb20b1..0e4df8d3da 100644 --- a/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro @@ -2,10 +2,10 @@ CONFIG += testcase TARGET = tst_qdeclarativeloader macx:CONFIG -= app_bundle -INCLUDEPATH += ../../declarative/shared/ -HEADERS += ../../declarative/shared/testhttpserver.h +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qdeclarativeloader.cpp \ - ../../declarative/shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro index f7e6a5b292..6f426c50c5 100644 --- a/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro +++ b/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativemousearea macx:CONFIG -= app_bundle -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativemousearea.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativemousearea.cpp ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro b/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro index 0989aab14f..1957bdd9fd 100644 --- a/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro @@ -4,9 +4,9 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetext.cpp -INCLUDEPATH += ../../declarative/shared/ -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += ../../declarative/shared/testhttpserver.cpp +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro index 74c4215579..5c86e111e8 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativetextedit macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativetextedit.cpp ../../declarative/shared/testhttpserver.cpp -HEADERS += ../../declarative/shared/testhttpserver.h +SOURCES += tst_qdeclarativetextedit.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 621c1753b2..54b8567161 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include #include -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #include #include #include diff --git a/tests/auto/declarative/examples/data/dummytest.qml b/tests/auto/qtquick2/examples/data/dummytest.qml similarity index 100% rename from tests/auto/declarative/examples/data/dummytest.qml rename to tests/auto/qtquick2/examples/data/dummytest.qml diff --git a/tests/auto/declarative/examples/data/webbrowser/webbrowser.qml b/tests/auto/qtquick2/examples/data/webbrowser/webbrowser.qml similarity index 100% rename from tests/auto/declarative/examples/data/webbrowser/webbrowser.qml rename to tests/auto/qtquick2/examples/data/webbrowser/webbrowser.qml diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/qtquick2/examples/examples.pro similarity index 58% rename from tests/auto/declarative/examples/examples.pro rename to tests/auto/qtquick2/examples/examples.pro index d70040d6ec..ca169242e1 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/qtquick2/examples/examples.pro @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary -QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private testlib +QT += core-private gui-private declarative-private quick-private qtquick1-private widgets-private v8-private testlib diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/qtquick2/examples/tst_examples.cpp similarity index 99% rename from tests/auto/declarative/examples/tst_examples.cpp rename to tests/auto/qtquick2/examples/tst_examples.cpp index bacd25d0da..050ae49cfc 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/qtquick2/examples/tst_examples.cpp @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/geometry/geometry.pro b/tests/auto/qtquick2/geometry/geometry.pro similarity index 60% rename from tests/auto/declarative/geometry/geometry.pro rename to tests/auto/qtquick2/geometry/geometry.pro index a66399a6e0..04d529cfb8 100644 --- a/tests/auto/declarative/geometry/geometry.pro +++ b/tests/auto/qtquick2/geometry/geometry.pro @@ -6,4 +6,4 @@ SOURCES += tst_geometry.cpp CONFIG+=parallel_test -QT += core-private gui-private declarative-private opengl testlib +QT += core-private gui-private declarative-private quick-private opengl testlib diff --git a/tests/auto/declarative/geometry/tst_geometry.cpp b/tests/auto/qtquick2/geometry/tst_geometry.cpp similarity index 99% rename from tests/auto/declarative/geometry/tst_geometry.cpp rename to tests/auto/qtquick2/geometry/tst_geometry.cpp index 2915902fa4..23e37dae2f 100644 --- a/tests/auto/declarative/geometry/tst_geometry.cpp +++ b/tests/auto/qtquick2/geometry/tst_geometry.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include class GeometryTest : public QObject { diff --git a/tests/auto/declarative/nodes/nodes.pro b/tests/auto/qtquick2/nodes/nodes.pro similarity index 58% rename from tests/auto/declarative/nodes/nodes.pro rename to tests/auto/qtquick2/nodes/nodes.pro index b622c6a4b3..40eeb2ab78 100644 --- a/tests/auto/declarative/nodes/nodes.pro +++ b/tests/auto/qtquick2/nodes/nodes.pro @@ -6,4 +6,4 @@ SOURCES += tst_nodestest.cpp CONFIG+=parallel_test -QT += core-private gui-private declarative-private opengl widgets testlib +QT += core-private gui-private declarative-private quick-private opengl widgets testlib diff --git a/tests/auto/declarative/nodes/tst_nodestest.cpp b/tests/auto/qtquick2/nodes/tst_nodestest.cpp similarity index 98% rename from tests/auto/declarative/nodes/tst_nodestest.cpp rename to tests/auto/qtquick2/nodes/tst_nodestest.cpp index d4782f93f4..3036bbf2dd 100644 --- a/tests/auto/declarative/nodes/tst_nodestest.cpp +++ b/tests/auto/qtquick2/nodes/tst_nodestest.cpp @@ -42,11 +42,11 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include #include class NodesTest : public QObject { diff --git a/tests/auto/declarative/qdeclarativeanimations/data/Double.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/Double.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/Double.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/Double.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/attached.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/attached.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/attached.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/attached.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badproperty1.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/badproperty1.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badproperty2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/badproperty2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype1.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/badtype1.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/badtype2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/badtype3.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype4.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/badtype4.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/disabledTransition.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/disabledTransition.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/disabledTransition.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/disabledTransition.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/dontAutoStart.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/dontAutoStart.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/dontStart.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/dontStart.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/dontStart2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/dontStart2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/dotproperty.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/dotproperty.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/doubleRegistrationBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/doubleRegistrationBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype1.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype1.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/nonTransitionBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/nonTransitionBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimation.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/pathAnimation.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimation2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/pathAnimation2.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimationNoStart.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimationNoStart.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/pathAnimationNoStart.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimationNoStart.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathInterpolator.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolator.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/pathInterpolator.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolator.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathInterpolatorBack.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolatorBack.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/pathInterpolatorBack.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolatorBack.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathTransition.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathTransition.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/pathTransition.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/pathTransition.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pauseBindingBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pauseBindingBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/pauseBindingBug.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/pauseBindingBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pauseBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pauseBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/pauseBug.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/pauseBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/properties.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/properties.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/properties2.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/properties2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/properties3.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/properties3.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties4.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/properties4.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/properties4.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties5.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/properties5.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/properties5.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition3.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition4.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition4.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition5.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition5.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition6.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition6.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition7.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition7.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/registrationBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/registrationBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/rotation.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/rotation.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/rotation.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/rotation.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/runningTrueBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/runningTrueBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/transitionAssignmentBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/transitionAssignmentBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/valuesource.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/valuesource.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/valuesource2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml rename to tests/auto/qtquick2/qdeclarativeanimations/data/valuesource2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro similarity index 69% rename from tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro rename to tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro index 5870d74ab2..fd35266f66 100644 --- a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp similarity index 98% rename from tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp rename to tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 515c8fa918..ca329263e9 100644 --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -41,20 +41,20 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeanimations : public QObject { diff --git a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/qtquick2/qdeclarativeapplication/qdeclarativeapplication.pro similarity index 63% rename from tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro rename to tests/auto/qtquick2/qdeclarativeapplication/qdeclarativeapplication.pro index 3b01fcf9e3..b86f431d31 100644 --- a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/qtquick2/qdeclarativeapplication/qdeclarativeapplication.pro @@ -3,5 +3,5 @@ TARGET = tst_qdeclarativeapplication macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeapplication.cpp -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp similarity index 98% rename from tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp rename to tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index 72313ab054..be822d8f7f 100644 --- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -42,8 +42,8 @@ #include #include #include -#include -#include +#include +#include #include class tst_qdeclarativeapplication : public QObject diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/binding.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/binding.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/binding.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/color.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/color.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/color.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/color.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/cpptrigger.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/cpptrigger.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/delayedRegistration.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/delayedRegistration.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/delayedRegistration.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/delayedRegistration.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/disabled.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/disabled.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/dontStart.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/dontStart.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/empty.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/empty.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/empty.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/explicit.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/explicit.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty2.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupedPropertyCrash.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/groupedPropertyCrash.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/loop.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/loop.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/loop.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/nonSelecting2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/nonSelecting2.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/parent.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/parent.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/parent.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/qtbug12295.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/qtbug12295.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/reassignedAnimation.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/reassignedAnimation.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/runningTrue.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/runningTrue.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/scripttrigger.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/scripttrigger.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/simple.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/simple.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/simple.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/startOnCompleted.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/startOnCompleted.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/startOnCompleted.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/startOnCompleted.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/startup.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/startup.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/startup.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/startup.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/startup2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/startup2.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/valueType.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/valueType.qml similarity index 100% rename from tests/auto/declarative/qdeclarativebehaviors/data/valueType.qml rename to tests/auto/qtquick2/qdeclarativebehaviors/data/valueType.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro similarity index 69% rename from tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro rename to tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro index 0e7c73ab90..3ac9446a4c 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp similarity index 98% rename from tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp rename to tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp index d1c1ca7d9c..526a23f262 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp +++ b/tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp @@ -42,13 +42,13 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativebehaviors : public QObject { diff --git a/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf b/tests/auto/qtquick2/qdeclarativefontloader/data/daniel.ttf similarity index 100% rename from tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf rename to tests/auto/qtquick2/qdeclarativefontloader/data/daniel.ttf diff --git a/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf b/tests/auto/qtquick2/qdeclarativefontloader/data/dummy.ttf similarity index 100% rename from tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf rename to tests/auto/qtquick2/qdeclarativefontloader/data/dummy.ttf diff --git a/tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml b/tests/auto/qtquick2/qdeclarativefontloader/data/qtbug-20268.qml similarity index 100% rename from tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml rename to tests/auto/qtquick2/qdeclarativefontloader/data/qtbug-20268.qml diff --git a/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf b/tests/auto/qtquick2/qdeclarativefontloader/data/tarzeau_ocr_a.ttf similarity index 100% rename from tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf rename to tests/auto/qtquick2/qdeclarativefontloader/data/tarzeau_ocr_a.ttf diff --git a/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro new file mode 100644 index 0000000000..de9461f7ac --- /dev/null +++ b/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro @@ -0,0 +1,14 @@ +CONFIG += testcase +TARGET = tst_qdeclarativefontloader +macx:CONFIG -= app_bundle + +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativefontloader.cpp ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp similarity index 98% rename from tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp rename to tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 6e81befad8..86789068ad 100644 --- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -43,11 +43,11 @@ #include #include #include -#include -#include "../shared/util.h" -#include "../../declarative/shared/testhttpserver.h" -#include -#include +#include +#include "../../shared/util.h" +#include "../../shared/testhttpserver.h" +#include +#include #define SERVER_PORT 14448 diff --git a/tests/auto/declarative/qdeclarativepath/data/arc.qml b/tests/auto/qtquick2/qdeclarativepath/data/arc.qml similarity index 100% rename from tests/auto/declarative/qdeclarativepath/data/arc.qml rename to tests/auto/qtquick2/qdeclarativepath/data/arc.qml diff --git a/tests/auto/declarative/qdeclarativepath/data/curve.qml b/tests/auto/qtquick2/qdeclarativepath/data/curve.qml similarity index 100% rename from tests/auto/declarative/qdeclarativepath/data/curve.qml rename to tests/auto/qtquick2/qdeclarativepath/data/curve.qml diff --git a/tests/auto/declarative/qdeclarativepath/data/svg.qml b/tests/auto/qtquick2/qdeclarativepath/data/svg.qml similarity index 100% rename from tests/auto/declarative/qdeclarativepath/data/svg.qml rename to tests/auto/qtquick2/qdeclarativepath/data/svg.qml diff --git a/tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro b/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro similarity index 72% rename from tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro rename to tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro index 212117165d..9f4204efa3 100644 --- a/tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro +++ b/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp b/tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp similarity index 98% rename from tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp rename to tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp index 91513fc8a5..bf4f70b292 100644 --- a/tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp +++ b/tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp @@ -42,9 +42,9 @@ #include #include #include -#include +#include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_QDeclarativePath : public QObject { diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/exists.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/exists.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists1.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/exists1.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists2.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/exists2.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists1.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists1.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists1.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists1.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists2.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists2.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists2.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists2.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists3.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists3.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists3.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists3.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists4.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists4.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists4.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists4.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists5.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists5.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists5.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists5.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists6.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists6.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists6.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists6.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists7.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists7.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists7.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists7.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists8.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists8.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists8.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists8.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/massive.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/massive.png similarity index 100% rename from tests/auto/declarative/qdeclarativepixmapcache/data/massive.png rename to tests/auto/qtquick2/qdeclarativepixmapcache/data/massive.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro similarity index 60% rename from tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro rename to tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 79d411c62c..391c28c10a 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -4,9 +4,9 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h -SOURCES += ../shared/testhttpserver.cpp +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp importFiles.files = data importFiles.path = . @@ -17,4 +17,4 @@ DEPLOYMENT += importFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp rename to tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 7a1c9e6bfd..2e326263c0 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include #include -#include +#include #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include "testhttpserver.h" #ifndef QT_NO_CONCURRENT @@ -406,7 +406,7 @@ void tst_qdeclarativepixmapcache::lockingCrash() } } -#include +#include class DataLeakView : public QQuickView { Q_OBJECT diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml similarity index 100% rename from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml rename to tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml rename to tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml rename to tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml similarity index 100% rename from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml rename to tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml similarity index 100% rename from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml rename to tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro similarity index 74% rename from tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro rename to tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index 05d31be39d..1e8a7d5ba6 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp similarity index 98% rename from tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp rename to tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index 735af520fe..632bcda091 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -42,9 +42,9 @@ #include #include #include -#include +#include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativesmoothedanimation : public QObject { diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation1.qml similarity index 100% rename from tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml rename to tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation1.qml diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml rename to tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation2.qml diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml rename to tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation3.qml diff --git a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro similarity index 73% rename from tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro rename to tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro index 7153327829..3ac2551380 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp b/tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp rename to tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp index d7edcee386..f7acc2a3e0 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp +++ b/tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp @@ -43,7 +43,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativespringanimation : public QObject { diff --git a/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml b/tests/auto/qtquick2/qdeclarativestates/data/ExtendedRectangle.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml rename to tests/auto/qtquick2/qdeclarativestates/data/ExtendedRectangle.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml b/tests/auto/qtquick2/qdeclarativestates/data/Implementation/MyType.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml rename to tests/auto/qtquick2/qdeclarativestates/data/Implementation/MyType.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png b/tests/auto/qtquick2/qdeclarativestates/data/Implementation/images/qt-logo.png similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png rename to tests/auto/qtquick2/qdeclarativestates/data/Implementation/images/qt-logo.png diff --git a/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml b/tests/auto/qtquick2/qdeclarativestates/data/QTBUG-14830.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml rename to tests/auto/qtquick2/qdeclarativestates/data/QTBUG-14830.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges1.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml rename to tests/auto/qtquick2/qdeclarativestates/data/anchorChanges1.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml rename to tests/auto/qtquick2/qdeclarativestates/data/anchorChanges2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml rename to tests/auto/qtquick2/qdeclarativestates/data/anchorChanges3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges4.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml rename to tests/auto/qtquick2/qdeclarativestates/data/anchorChanges4.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges5.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml rename to tests/auto/qtquick2/qdeclarativestates/data/anchorChanges5.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChangesCrash.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml rename to tests/auto/qtquick2/qdeclarativestates/data/anchorChangesCrash.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml rename to tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml rename to tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml b/tests/auto/qtquick2/qdeclarativestates/data/attachedPropertyChanges.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml rename to tests/auto/qtquick2/qdeclarativestates/data/attachedPropertyChanges.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml b/tests/auto/qtquick2/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml rename to tests/auto/qtquick2/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/avoidFastForward.qml b/tests/auto/qtquick2/qdeclarativestates/data/avoidFastForward.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/avoidFastForward.qml rename to tests/auto/qtquick2/qdeclarativestates/data/avoidFastForward.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicBinding.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicBinding.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicBinding2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicBinding3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding4.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicBinding4.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicChanges.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicChanges.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicChanges2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicChanges3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges4.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicChanges4.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicExtension.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/basicExtension.qml rename to tests/auto/qtquick2/qdeclarativestates/data/basicExtension.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/deleting.qml b/tests/auto/qtquick2/qdeclarativestates/data/deleting.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/deleting.qml rename to tests/auto/qtquick2/qdeclarativestates/data/deleting.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/deletingState.qml b/tests/auto/qtquick2/qdeclarativestates/data/deletingState.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/deletingState.qml rename to tests/auto/qtquick2/qdeclarativestates/data/deletingState.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/editProperties.qml b/tests/auto/qtquick2/qdeclarativestates/data/editProperties.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/editProperties.qml rename to tests/auto/qtquick2/qdeclarativestates/data/editProperties.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/explicit.qml b/tests/auto/qtquick2/qdeclarativestates/data/explicit.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/explicit.qml rename to tests/auto/qtquick2/qdeclarativestates/data/explicit.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/extendsBug.qml b/tests/auto/qtquick2/qdeclarativestates/data/extendsBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/extendsBug.qml rename to tests/auto/qtquick2/qdeclarativestates/data/extendsBug.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml b/tests/auto/qtquick2/qdeclarativestates/data/fakeExtension.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml rename to tests/auto/qtquick2/qdeclarativestates/data/fakeExtension.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/illegalObj.qml b/tests/auto/qtquick2/qdeclarativestates/data/illegalObj.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/illegalObj.qml rename to tests/auto/qtquick2/qdeclarativestates/data/illegalObj.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml b/tests/auto/qtquick2/qdeclarativestates/data/illegalTempState.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml rename to tests/auto/qtquick2/qdeclarativestates/data/illegalTempState.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/image.png b/tests/auto/qtquick2/qdeclarativestates/data/image.png similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/image.png rename to tests/auto/qtquick2/qdeclarativestates/data/image.png diff --git a/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml b/tests/auto/qtquick2/qdeclarativestates/data/legalTempState.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/legalTempState.qml rename to tests/auto/qtquick2/qdeclarativestates/data/legalTempState.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml b/tests/auto/qtquick2/qdeclarativestates/data/nonExistantProp.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml rename to tests/auto/qtquick2/qdeclarativestates/data/nonExistantProp.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange1.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange1.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/parentChange1.qml rename to tests/auto/qtquick2/qdeclarativestates/data/parentChange1.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/parentChange2.qml rename to tests/auto/qtquick2/qdeclarativestates/data/parentChange2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/parentChange3.qml rename to tests/auto/qtquick2/qdeclarativestates/data/parentChange3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange4.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/parentChange4.qml rename to tests/auto/qtquick2/qdeclarativestates/data/parentChange4.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange5.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/parentChange5.qml rename to tests/auto/qtquick2/qdeclarativestates/data/parentChange5.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange6.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange6.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/parentChange6.qml rename to tests/auto/qtquick2/qdeclarativestates/data/parentChange6.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml b/tests/auto/qtquick2/qdeclarativestates/data/propertyErrors.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml rename to tests/auto/qtquick2/qdeclarativestates/data/propertyErrors.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/reset.qml b/tests/auto/qtquick2/qdeclarativestates/data/reset.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/reset.qml rename to tests/auto/qtquick2/qdeclarativestates/data/reset.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml b/tests/auto/qtquick2/qdeclarativestates/data/restoreEntryValues.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml rename to tests/auto/qtquick2/qdeclarativestates/data/restoreEntryValues.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/returnToBase.qml b/tests/auto/qtquick2/qdeclarativestates/data/returnToBase.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/returnToBase.qml rename to tests/auto/qtquick2/qdeclarativestates/data/returnToBase.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/revertListBug.qml b/tests/auto/qtquick2/qdeclarativestates/data/revertListBug.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/revertListBug.qml rename to tests/auto/qtquick2/qdeclarativestates/data/revertListBug.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/script.qml b/tests/auto/qtquick2/qdeclarativestates/data/script.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/script.qml rename to tests/auto/qtquick2/qdeclarativestates/data/script.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverride.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/signalOverride.qml rename to tests/auto/qtquick2/qdeclarativestates/data/signalOverride.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverride2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml rename to tests/auto/qtquick2/qdeclarativestates/data/signalOverride2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml rename to tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash2.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml rename to tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash3.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash3.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash3.qml rename to tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml b/tests/auto/qtquick2/qdeclarativestates/data/unnamedWhen.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml rename to tests/auto/qtquick2/qdeclarativestates/data/unnamedWhen.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml b/tests/auto/qtquick2/qdeclarativestates/data/urlResolution.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/urlResolution.qml rename to tests/auto/qtquick2/qdeclarativestates/data/urlResolution.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml b/tests/auto/qtquick2/qdeclarativestates/data/whenOrdering.qml similarity index 100% rename from tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml rename to tests/auto/qtquick2/qdeclarativestates/data/whenOrdering.qml diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro similarity index 68% rename from tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro rename to tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro index c0ffda7828..f799f7066b 100644 --- a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro @@ -9,4 +9,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp rename to tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp index 2535f89030..663d78d402 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp @@ -41,16 +41,16 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class MyAttached : public QObject { diff --git a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro b/tests/auto/qtquick2/qdeclarativestyledtext/qdeclarativestyledtext.pro similarity index 64% rename from tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro rename to tests/auto/qtquick2/qdeclarativestyledtext/qdeclarativestyledtext.pro index 70e6fafe59..84532f611e 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro +++ b/tests/auto/qtquick2/qdeclarativestyledtext/qdeclarativestyledtext.pro @@ -5,4 +5,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestyledtext.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp b/tests/auto/qtquick2/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp similarity index 100% rename from tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp rename to tests/auto/qtquick2/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/qtquick2/qdeclarativesystempalette/qdeclarativesystempalette.pro similarity index 65% rename from tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro rename to tests/auto/qtquick2/qdeclarativesystempalette/qdeclarativesystempalette.pro index 4eee37678f..87c2af2190 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/qtquick2/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -5,4 +5,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesystempalette.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private widgets testlib +QT += core-private gui-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/qtquick2/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp rename to tests/auto/qtquick2/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp index 8c9543273c..4cb09f90f5 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp +++ b/tests/auto/qtquick2/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include class tst_qdeclarativesystempalette : public QObject diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/qtquick2/qdeclarativetimer/qdeclarativetimer.pro similarity index 64% rename from tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro rename to tests/auto/qtquick2/qdeclarativetimer/qdeclarativetimer.pro index 60e59f01f6..d990dc449f 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/qtquick2/qdeclarativetimer/qdeclarativetimer.pro @@ -5,4 +5,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetimer.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private gui testlib +QT += core-private gui-private declarative-private quick-private gui testlib diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/qtquick2/qdeclarativetimer/tst_qdeclarativetimer.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp rename to tests/auto/qtquick2/qdeclarativetimer/tst_qdeclarativetimer.cpp index 1e795099e8..ac32585365 100644 --- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp +++ b/tests/auto/qtquick2/qdeclarativetimer/tst_qdeclarativetimer.cpp @@ -42,8 +42,8 @@ #include #include #include -#include -#include +#include +#include #include class tst_qdeclarativetimer : public QObject diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/empty.xml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/empty.xml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/empty.xml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/empty.xml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/get.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/get.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/get.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/get.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.xml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.xml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model2.xml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/model2.xml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/propertychanges.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/propertychanges.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.xml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.xml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleCrash.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleCrash.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/roleCrash.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleCrash.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleErrors.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleErrors.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleKeys.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleKeys.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/testtypes.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/testtypes.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/unique.qml similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml rename to tests/auto/qtquick2/qdeclarativexmllistmodel/data/unique.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro similarity index 100% rename from tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro rename to tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp rename to tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index c2cf4a69f6..316ac50c5e 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -51,7 +51,7 @@ #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include #include diff --git a/tests/auto/declarative/qquickanchors/data/anchors.qml b/tests/auto/qtquick2/qquickanchors/data/anchors.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/anchors.qml rename to tests/auto/qtquick2/qquickanchors/data/anchors.qml diff --git a/tests/auto/declarative/qquickanchors/data/centerin.qml b/tests/auto/qtquick2/qquickanchors/data/centerin.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/centerin.qml rename to tests/auto/qtquick2/qquickanchors/data/centerin.qml diff --git a/tests/auto/declarative/qquickanchors/data/centerinRotation.qml b/tests/auto/qtquick2/qquickanchors/data/centerinRotation.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/centerinRotation.qml rename to tests/auto/qtquick2/qquickanchors/data/centerinRotation.qml diff --git a/tests/auto/declarative/qquickanchors/data/crash1.qml b/tests/auto/qtquick2/qquickanchors/data/crash1.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/crash1.qml rename to tests/auto/qtquick2/qquickanchors/data/crash1.qml diff --git a/tests/auto/declarative/qquickanchors/data/fill.qml b/tests/auto/qtquick2/qquickanchors/data/fill.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/fill.qml rename to tests/auto/qtquick2/qquickanchors/data/fill.qml diff --git a/tests/auto/declarative/qquickanchors/data/hvCenter.qml b/tests/auto/qtquick2/qquickanchors/data/hvCenter.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/hvCenter.qml rename to tests/auto/qtquick2/qquickanchors/data/hvCenter.qml diff --git a/tests/auto/declarative/qquickanchors/data/loop1.qml b/tests/auto/qtquick2/qquickanchors/data/loop1.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/loop1.qml rename to tests/auto/qtquick2/qquickanchors/data/loop1.qml diff --git a/tests/auto/declarative/qquickanchors/data/loop2.qml b/tests/auto/qtquick2/qquickanchors/data/loop2.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/loop2.qml rename to tests/auto/qtquick2/qquickanchors/data/loop2.qml diff --git a/tests/auto/declarative/qquickanchors/data/margins.qml b/tests/auto/qtquick2/qquickanchors/data/margins.qml similarity index 100% rename from tests/auto/declarative/qquickanchors/data/margins.qml rename to tests/auto/qtquick2/qquickanchors/data/margins.qml diff --git a/tests/auto/declarative/qquickanchors/qquickanchors.pro b/tests/auto/qtquick2/qquickanchors/qquickanchors.pro similarity index 71% rename from tests/auto/declarative/qquickanchors/qquickanchors.pro rename to tests/auto/qtquick2/qquickanchors/qquickanchors.pro index 0d085d367d..92f24cff07 100644 --- a/tests/auto/declarative/qquickanchors/qquickanchors.pro +++ b/tests/auto/qtquick2/qquickanchors/qquickanchors.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private v8-private testlib +QT += core-private gui-private declarative-private quick-private v8-private testlib diff --git a/tests/auto/declarative/qquickanchors/tst_qquickanchors.cpp b/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp similarity index 99% rename from tests/auto/declarative/qquickanchors/tst_qquickanchors.cpp rename to tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp index 00b52ebc50..cae1421573 100644 --- a/tests/auto/declarative/qquickanchors/tst_qquickanchors.cpp +++ b/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp @@ -43,12 +43,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include "../shared/util.h" +#include +#include +#include +#include +#include +#include "../../shared/util.h" Q_DECLARE_METATYPE(QQuickAnchors::Anchor) Q_DECLARE_METATYPE(QQuickAnchorLine::AnchorLine) diff --git a/tests/auto/declarative/qquickanimatedimage/data/colors.gif b/tests/auto/qtquick2/qquickanimatedimage/data/colors.gif similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/colors.gif rename to tests/auto/qtquick2/qquickanimatedimage/data/colors.gif diff --git a/tests/auto/declarative/qquickanimatedimage/data/colors.qml b/tests/auto/qtquick2/qquickanimatedimage/data/colors.qml similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/colors.qml rename to tests/auto/qtquick2/qquickanimatedimage/data/colors.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/hearts.gif b/tests/auto/qtquick2/qquickanimatedimage/data/hearts.gif similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/hearts.gif rename to tests/auto/qtquick2/qquickanimatedimage/data/hearts.gif diff --git a/tests/auto/declarative/qquickanimatedimage/data/hearts.qml b/tests/auto/qtquick2/qquickanimatedimage/data/hearts.qml similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/hearts.qml rename to tests/auto/qtquick2/qquickanimatedimage/data/hearts.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/qmldir b/tests/auto/qtquick2/qquickanimatedimage/data/qmldir similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/qmldir rename to tests/auto/qtquick2/qquickanimatedimage/data/qmldir diff --git a/tests/auto/declarative/qquickanimatedimage/data/qtbug-16520.qml b/tests/auto/qtquick2/qquickanimatedimage/data/qtbug-16520.qml similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/qtbug-16520.qml rename to tests/auto/qtquick2/qquickanimatedimage/data/qtbug-16520.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickman.gif b/tests/auto/qtquick2/qquickanimatedimage/data/stickman.gif similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/stickman.gif rename to tests/auto/qtquick2/qquickanimatedimage/data/stickman.gif diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickman.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickman.qml similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/stickman.qml rename to tests/auto/qtquick2/qquickanimatedimage/data/stickman.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickmanerror1.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanerror1.qml similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/stickmanerror1.qml rename to tests/auto/qtquick2/qquickanimatedimage/data/stickmanerror1.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickmanpause.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanpause.qml similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/stickmanpause.qml rename to tests/auto/qtquick2/qquickanimatedimage/data/stickmanpause.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickmanscaled.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanscaled.qml similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/stickmanscaled.qml rename to tests/auto/qtquick2/qquickanimatedimage/data/stickmanscaled.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickmanstopped.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanstopped.qml similarity index 100% rename from tests/auto/declarative/qquickanimatedimage/data/stickmanstopped.qml rename to tests/auto/qtquick2/qquickanimatedimage/data/stickmanstopped.qml diff --git a/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro new file mode 100644 index 0000000000..56394592b8 --- /dev/null +++ b/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro @@ -0,0 +1,13 @@ +CONFIG += testcase +TARGET = tst_qquickanimatedimage +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquickanimatedimage.cpp ../../shared/testhttpserver.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp similarity index 98% rename from tests/auto/declarative/qquickanimatedimage/tst_qquickanimatedimage.cpp rename to tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp index 542811efc1..bf1017fe21 100644 --- a/tests/auto/declarative/qquickanimatedimage/tst_qquickanimatedimage.cpp +++ b/tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp @@ -41,15 +41,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include "../shared/testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/testhttpserver.h" +#include "../../shared/util.h" Q_DECLARE_METATYPE(QQuickImageBase::Status) diff --git a/tests/auto/declarative/qquickborderimage/data/colors-mirror.png b/tests/auto/qtquick2/qquickborderimage/data/colors-mirror.png similarity index 100% rename from tests/auto/declarative/qquickborderimage/data/colors-mirror.png rename to tests/auto/qtquick2/qquickborderimage/data/colors-mirror.png diff --git a/tests/auto/declarative/qquickborderimage/data/colors-round-quotes.sci b/tests/auto/qtquick2/qquickborderimage/data/colors-round-quotes.sci similarity index 100% rename from tests/auto/declarative/qquickborderimage/data/colors-round-quotes.sci rename to tests/auto/qtquick2/qquickborderimage/data/colors-round-quotes.sci diff --git a/tests/auto/declarative/qquickborderimage/data/colors-round-remote.sci b/tests/auto/qtquick2/qquickborderimage/data/colors-round-remote.sci similarity index 100% rename from tests/auto/declarative/qquickborderimage/data/colors-round-remote.sci rename to tests/auto/qtquick2/qquickborderimage/data/colors-round-remote.sci diff --git a/tests/auto/declarative/qquickborderimage/data/colors-round.sci b/tests/auto/qtquick2/qquickborderimage/data/colors-round.sci similarity index 100% rename from tests/auto/declarative/qquickborderimage/data/colors-round.sci rename to tests/auto/qtquick2/qquickborderimage/data/colors-round.sci diff --git a/tests/auto/declarative/qquickborderimage/data/colors.png b/tests/auto/qtquick2/qquickborderimage/data/colors.png similarity index 100% rename from tests/auto/declarative/qquickborderimage/data/colors.png rename to tests/auto/qtquick2/qquickborderimage/data/colors.png diff --git a/tests/auto/declarative/qquickborderimage/data/heart200.png b/tests/auto/qtquick2/qquickborderimage/data/heart200.png similarity index 100% rename from tests/auto/declarative/qquickborderimage/data/heart200.png rename to tests/auto/qtquick2/qquickborderimage/data/heart200.png diff --git a/tests/auto/declarative/qquickborderimage/data/invalid.sci b/tests/auto/qtquick2/qquickborderimage/data/invalid.sci similarity index 100% rename from tests/auto/declarative/qquickborderimage/data/invalid.sci rename to tests/auto/qtquick2/qquickborderimage/data/invalid.sci diff --git a/tests/auto/declarative/qquickborderimage/data/mirror.qml b/tests/auto/qtquick2/qquickborderimage/data/mirror.qml similarity index 100% rename from tests/auto/declarative/qquickborderimage/data/mirror.qml rename to tests/auto/qtquick2/qquickborderimage/data/mirror.qml diff --git a/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro b/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro new file mode 100644 index 0000000000..34d08aa37f --- /dev/null +++ b/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro @@ -0,0 +1,14 @@ +CONFIG += testcase +TARGET = tst_qquickborderimage +macx:CONFIG -= app_bundle + +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquickborderimage.cpp ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private quick-private network widgets testlib diff --git a/tests/auto/declarative/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp similarity index 99% rename from tests/auto/declarative/qquickborderimage/tst_qquickborderimage.cpp rename to tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp index 4fb6ed7057..b9fd91d7fb 100644 --- a/tests/auto/declarative/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp @@ -52,11 +52,11 @@ #include #include #include -#include +#include #include -#include "../shared/testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/testhttpserver.h" +#include "../../shared/util.h" #define SERVER_PORT 14446 #define SERVER_ADDR "http://127.0.0.1:14446" diff --git a/tests/auto/declarative/qquickcanvas/data/window.qml b/tests/auto/qtquick2/qquickcanvas/data/window.qml similarity index 100% rename from tests/auto/declarative/qquickcanvas/data/window.qml rename to tests/auto/qtquick2/qquickcanvas/data/window.qml diff --git a/tests/auto/declarative/qquickcanvas/qquickcanvas.pro b/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro similarity index 63% rename from tests/auto/declarative/qquickcanvas/qquickcanvas.pro rename to tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro index b45a3597d4..c95d474a21 100644 --- a/tests/auto/declarative/qquickcanvas/qquickcanvas.pro +++ b/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro @@ -5,4 +5,4 @@ SOURCES += tst_qquickcanvas.cpp macx:CONFIG -= app_bundle CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp similarity index 99% rename from tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp rename to tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp index 829d666b7e..f894ff3d39 100644 --- a/tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp +++ b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp @@ -42,13 +42,13 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include -#include "../shared/util.h" +#include "../../shared/util.h" struct TouchEventData { QEvent::Type type; diff --git a/tests/auto/declarative/qquickcanvasitem/data/anim-gr.gif b/tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.gif similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/anim-gr.gif rename to tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.gif diff --git a/tests/auto/declarative/qquickcanvasitem/data/anim-gr.png b/tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/anim-gr.png rename to tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/anim-poster-gr.png b/tests/auto/qtquick2/qquickcanvasitem/data/anim-poster-gr.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/anim-poster-gr.png rename to tests/auto/qtquick2/qquickcanvasitem/data/anim-poster-gr.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/background.png b/tests/auto/qtquick2/qquickcanvasitem/data/background.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/background.png rename to tests/auto/qtquick2/qquickcanvasitem/data/background.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/broken.png b/tests/auto/qtquick2/qquickcanvasitem/data/broken.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/broken.png rename to tests/auto/qtquick2/qquickcanvasitem/data/broken.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/ggrr-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/ggrr-256x256.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/ggrr-256x256.png rename to tests/auto/qtquick2/qquickcanvasitem/data/ggrr-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green-16x16.png b/tests/auto/qtquick2/qquickcanvasitem/data/green-16x16.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/green-16x16.png rename to tests/auto/qtquick2/qquickcanvasitem/data/green-16x16.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green-1x1.png b/tests/auto/qtquick2/qquickcanvasitem/data/green-1x1.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/green-1x1.png rename to tests/auto/qtquick2/qquickcanvasitem/data/green-1x1.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/green-256x256.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/green-256x256.png rename to tests/auto/qtquick2/qquickcanvasitem/data/green-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green-2x2.png b/tests/auto/qtquick2/qquickcanvasitem/data/green-2x2.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/green-2x2.png rename to tests/auto/qtquick2/qquickcanvasitem/data/green-2x2.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green.png b/tests/auto/qtquick2/qquickcanvasitem/data/green.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/green.png rename to tests/auto/qtquick2/qquickcanvasitem/data/green.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/grgr-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/grgr-256x256.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/grgr-256x256.png rename to tests/auto/qtquick2/qquickcanvasitem/data/grgr-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/red-16x16.png b/tests/auto/qtquick2/qquickcanvasitem/data/red-16x16.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/red-16x16.png rename to tests/auto/qtquick2/qquickcanvasitem/data/red-16x16.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/red.png b/tests/auto/qtquick2/qquickcanvasitem/data/red.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/red.png rename to tests/auto/qtquick2/qquickcanvasitem/data/red.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/redtransparent.png b/tests/auto/qtquick2/qquickcanvasitem/data/redtransparent.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/redtransparent.png rename to tests/auto/qtquick2/qquickcanvasitem/data/redtransparent.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/rgrg-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/rgrg-256x256.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/rgrg-256x256.png rename to tests/auto/qtquick2/qquickcanvasitem/data/rgrg-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/rrgg-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/rrgg-256x256.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/rrgg-256x256.png rename to tests/auto/qtquick2/qquickcanvasitem/data/rrgg-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/testhelper.js b/tests/auto/qtquick2/qquickcanvasitem/data/testhelper.js similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/testhelper.js rename to tests/auto/qtquick2/qquickcanvasitem/data/testhelper.js diff --git a/tests/auto/declarative/qquickcanvasitem/data/transparent.png b/tests/auto/qtquick2/qquickcanvasitem/data/transparent.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/transparent.png rename to tests/auto/qtquick2/qquickcanvasitem/data/transparent.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/transparent50.png b/tests/auto/qtquick2/qquickcanvasitem/data/transparent50.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/transparent50.png rename to tests/auto/qtquick2/qquickcanvasitem/data/transparent50.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_arc.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_arc.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_arc.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_arc.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_arcto.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_arcto.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_arcto.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_arcto.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_canvas.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_canvas.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_canvas.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_canvas.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_composite.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_composite.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_composite.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_composite.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_drawimage.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_drawimage.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_fillStyle.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillStyle.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_fillStyle.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_fillStyle.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_fillrect.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_fillrect.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_gradient.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_gradient.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_gradient.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_gradient.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_line.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_line.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_line.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_line.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_path.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_path.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_path.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_path.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_pattern.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_pattern.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_pattern.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_pattern.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_pixel.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_pixel.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_pixel.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_pixel.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_shadow.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_shadow.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_shadow.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_shadow.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_state.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_state.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_state.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_state.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_strokeStyle.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_strokeStyle.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_strokeStyle.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_strokeStyle.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_text.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_text.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_text.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_text.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_transform.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_transform.qml similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/tst_transform.qml rename to tests/auto/qtquick2/qquickcanvasitem/data/tst_transform.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/yellow.png b/tests/auto/qtquick2/qquickcanvasitem/data/yellow.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/yellow.png rename to tests/auto/qtquick2/qquickcanvasitem/data/yellow.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/yellow75.png b/tests/auto/qtquick2/qquickcanvasitem/data/yellow75.png similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/data/yellow75.png rename to tests/auto/qtquick2/qquickcanvasitem/data/yellow75.png diff --git a/tests/auto/declarative/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/qtquick2/qquickcanvasitem/qquickcanvasitem.pro similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/qquickcanvasitem.pro rename to tests/auto/qtquick2/qquickcanvasitem/qquickcanvasitem.pro diff --git a/tests/auto/declarative/qquickcanvasitem/tst_qquickcanvasitem.cpp b/tests/auto/qtquick2/qquickcanvasitem/tst_qquickcanvasitem.cpp similarity index 100% rename from tests/auto/declarative/qquickcanvasitem/tst_qquickcanvasitem.cpp rename to tests/auto/qtquick2/qquickcanvasitem/tst_qquickcanvasitem.cpp diff --git a/tests/auto/declarative/qquickdrag/qquickdrag.pro b/tests/auto/qtquick2/qquickdrag/qquickdrag.pro similarity index 60% rename from tests/auto/declarative/qquickdrag/qquickdrag.pro rename to tests/auto/qtquick2/qquickdrag/qquickdrag.pro index 416ecdbe8e..4fdfa7b355 100644 --- a/tests/auto/declarative/qquickdrag/qquickdrag.pro +++ b/tests/auto/qtquick2/qquickdrag/qquickdrag.pro @@ -6,4 +6,4 @@ SOURCES += tst_qquickdrag.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickdrag/tst_qquickdrag.cpp b/tests/auto/qtquick2/qquickdrag/tst_qquickdrag.cpp similarity index 99% rename from tests/auto/declarative/qquickdrag/tst_qquickdrag.cpp rename to tests/auto/qtquick2/qquickdrag/tst_qquickdrag.cpp index 6bc0866a6e..9163df6c62 100644 --- a/tests/auto/declarative/qquickdrag/tst_qquickdrag.cpp +++ b/tests/auto/qtquick2/qquickdrag/tst_qquickdrag.cpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qquickdroparea/qquickdroparea.pro b/tests/auto/qtquick2/qquickdroparea/qquickdroparea.pro similarity index 62% rename from tests/auto/declarative/qquickdroparea/qquickdroparea.pro rename to tests/auto/qtquick2/qquickdroparea/qquickdroparea.pro index eff08a2e94..46fe08c145 100644 --- a/tests/auto/declarative/qquickdroparea/qquickdroparea.pro +++ b/tests/auto/qtquick2/qquickdroparea/qquickdroparea.pro @@ -6,4 +6,4 @@ SOURCES += tst_qquickdroparea.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickdroparea/tst_qquickdroparea.cpp b/tests/auto/qtquick2/qquickdroparea/tst_qquickdroparea.cpp similarity index 99% rename from tests/auto/declarative/qquickdroparea/tst_qquickdroparea.cpp rename to tests/auto/qtquick2/qquickdroparea/tst_qquickdroparea.cpp index 0147536abf..f8a081ff21 100644 --- a/tests/auto/declarative/qquickdroparea/tst_qquickdroparea.cpp +++ b/tests/auto/qtquick2/qquickdroparea/tst_qquickdroparea.cpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qquickflickable/data/disabled.qml b/tests/auto/qtquick2/qquickflickable/data/disabled.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/disabled.qml rename to tests/auto/qtquick2/qquickflickable/data/disabled.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickable01.qml b/tests/auto/qtquick2/qquickflickable/data/flickable01.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/flickable01.qml rename to tests/auto/qtquick2/qquickflickable/data/flickable01.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickable02.qml b/tests/auto/qtquick2/qquickflickable/data/flickable02.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/flickable02.qml rename to tests/auto/qtquick2/qquickflickable/data/flickable02.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickable03.qml b/tests/auto/qtquick2/qquickflickable/data/flickable03.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/flickable03.qml rename to tests/auto/qtquick2/qquickflickable/data/flickable03.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickable04.qml b/tests/auto/qtquick2/qquickflickable/data/flickable04.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/flickable04.qml rename to tests/auto/qtquick2/qquickflickable/data/flickable04.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickableqgraphicswidget.qml b/tests/auto/qtquick2/qquickflickable/data/flickableqgraphicswidget.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/flickableqgraphicswidget.qml rename to tests/auto/qtquick2/qquickflickable/data/flickableqgraphicswidget.qml diff --git a/tests/auto/declarative/qquickflickable/data/margins.qml b/tests/auto/qtquick2/qquickflickable/data/margins.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/margins.qml rename to tests/auto/qtquick2/qquickflickable/data/margins.qml diff --git a/tests/auto/declarative/qquickflickable/data/nestedPressDelay.qml b/tests/auto/qtquick2/qquickflickable/data/nestedPressDelay.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/nestedPressDelay.qml rename to tests/auto/qtquick2/qquickflickable/data/nestedPressDelay.qml diff --git a/tests/auto/declarative/qquickflickable/data/resize.qml b/tests/auto/qtquick2/qquickflickable/data/resize.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/resize.qml rename to tests/auto/qtquick2/qquickflickable/data/resize.qml diff --git a/tests/auto/declarative/qquickflickable/data/wheel.qml b/tests/auto/qtquick2/qquickflickable/data/wheel.qml similarity index 100% rename from tests/auto/declarative/qquickflickable/data/wheel.qml rename to tests/auto/qtquick2/qquickflickable/data/wheel.qml diff --git a/tests/auto/declarative/qquickflickable/qquickflickable.pro b/tests/auto/qtquick2/qquickflickable/qquickflickable.pro similarity index 71% rename from tests/auto/declarative/qquickflickable/qquickflickable.pro rename to tests/auto/qtquick2/qquickflickable/qquickflickable.pro index ba951cc051..7376f593fd 100644 --- a/tests/auto/declarative/qquickflickable/qquickflickable.pro +++ b/tests/auto/qtquick2/qquickflickable/qquickflickable.pro @@ -9,4 +9,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp b/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp similarity index 99% rename from tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp rename to tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp index a02db06616..1827e0af1c 100644 --- a/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp @@ -42,11 +42,11 @@ #include #include #include -#include +#include #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include class tst_qquickflickable : public QObject diff --git a/tests/auto/declarative/qquickflipable/data/crash.qml b/tests/auto/qtquick2/qquickflipable/data/crash.qml similarity index 100% rename from tests/auto/declarative/qquickflipable/data/crash.qml rename to tests/auto/qtquick2/qquickflipable/data/crash.qml diff --git a/tests/auto/declarative/qquickflipable/data/flipable-abort.qml b/tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml similarity index 100% rename from tests/auto/declarative/qquickflipable/data/flipable-abort.qml rename to tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml diff --git a/tests/auto/declarative/qquickflipable/data/test-flipable.qml b/tests/auto/qtquick2/qquickflipable/data/test-flipable.qml similarity index 100% rename from tests/auto/declarative/qquickflipable/data/test-flipable.qml rename to tests/auto/qtquick2/qquickflipable/data/test-flipable.qml diff --git a/tests/auto/declarative/qquickflipable/qquickflipable.pro b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro similarity index 71% rename from tests/auto/declarative/qquickflipable/qquickflipable.pro rename to tests/auto/qtquick2/qquickflipable/qquickflipable.pro index a36c468c1c..532c42f79b 100644 --- a/tests/auto/declarative/qquickflipable/qquickflipable.pro +++ b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickflipable/tst_qquickflipable.cpp b/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp similarity index 97% rename from tests/auto/declarative/qquickflipable/tst_qquickflipable.cpp rename to tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp index 7243836031..a217e26714 100644 --- a/tests/auto/declarative/qquickflipable/tst_qquickflipable.cpp +++ b/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp @@ -41,14 +41,14 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qquickflipable : public QObject { diff --git a/tests/auto/declarative/qquickfocusscope/data/canvasFocus.qml b/tests/auto/qtquick2/qquickfocusscope/data/canvasFocus.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/canvasFocus.qml rename to tests/auto/qtquick2/qquickfocusscope/data/canvasFocus.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/chain.qml b/tests/auto/qtquick2/qquickfocusscope/data/chain.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/chain.qml rename to tests/auto/qtquick2/qquickfocusscope/data/chain.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/forceActiveFocus.qml b/tests/auto/qtquick2/qquickfocusscope/data/forceActiveFocus.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/forceActiveFocus.qml rename to tests/auto/qtquick2/qquickfocusscope/data/forceActiveFocus.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/forcefocus.qml b/tests/auto/qtquick2/qquickfocusscope/data/forcefocus.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/forcefocus.qml rename to tests/auto/qtquick2/qquickfocusscope/data/forcefocus.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/qtBug13380.qml b/tests/auto/qtquick2/qquickfocusscope/data/qtBug13380.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/qtBug13380.qml rename to tests/auto/qtquick2/qquickfocusscope/data/qtBug13380.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/signalEmission.qml b/tests/auto/qtquick2/qquickfocusscope/data/signalEmission.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/signalEmission.qml rename to tests/auto/qtquick2/qquickfocusscope/data/signalEmission.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test.qml b/tests/auto/qtquick2/qquickfocusscope/data/test.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/test.qml rename to tests/auto/qtquick2/qquickfocusscope/data/test.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test2.qml b/tests/auto/qtquick2/qquickfocusscope/data/test2.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/test2.qml rename to tests/auto/qtquick2/qquickfocusscope/data/test2.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test3.qml b/tests/auto/qtquick2/qquickfocusscope/data/test3.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/test3.qml rename to tests/auto/qtquick2/qquickfocusscope/data/test3.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test4.qml b/tests/auto/qtquick2/qquickfocusscope/data/test4.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/test4.qml rename to tests/auto/qtquick2/qquickfocusscope/data/test4.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test5.qml b/tests/auto/qtquick2/qquickfocusscope/data/test5.qml similarity index 100% rename from tests/auto/declarative/qquickfocusscope/data/test5.qml rename to tests/auto/qtquick2/qquickfocusscope/data/test5.qml diff --git a/tests/auto/declarative/qquickfocusscope/qquickfocusscope.pro b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro similarity index 72% rename from tests/auto/declarative/qquickfocusscope/qquickfocusscope.pro rename to tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro index 79649ebb8a..138750db3c 100644 --- a/tests/auto/declarative/qquickfocusscope/qquickfocusscope.pro +++ b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro @@ -7,4 +7,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp similarity index 99% rename from tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp rename to tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp index d0149ed1d6..11cc7a15e0 100644 --- a/tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp +++ b/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp @@ -42,12 +42,12 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include -#include "../shared/util.h" +#include +#include +#include "../../shared/util.h" class tst_qquickfocusscope : public QObject { diff --git a/tests/auto/declarative/qquickgridview/data/ComponentView.qml b/tests/auto/qtquick2/qquickgridview/data/ComponentView.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/ComponentView.qml rename to tests/auto/qtquick2/qquickgridview/data/ComponentView.qml diff --git a/tests/auto/declarative/qquickgridview/data/asyncloader.qml b/tests/auto/qtquick2/qquickgridview/data/asyncloader.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/asyncloader.qml rename to tests/auto/qtquick2/qquickgridview/data/asyncloader.qml diff --git a/tests/auto/declarative/qquickgridview/data/attachedSignals.qml b/tests/auto/qtquick2/qquickgridview/data/attachedSignals.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/attachedSignals.qml rename to tests/auto/qtquick2/qquickgridview/data/attachedSignals.qml diff --git a/tests/auto/declarative/qquickgridview/data/creationContext.qml b/tests/auto/qtquick2/qquickgridview/data/creationContext.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/creationContext.qml rename to tests/auto/qtquick2/qquickgridview/data/creationContext.qml diff --git a/tests/auto/declarative/qquickgridview/data/displaygrid.qml b/tests/auto/qtquick2/qquickgridview/data/displaygrid.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/displaygrid.qml rename to tests/auto/qtquick2/qquickgridview/data/displaygrid.qml diff --git a/tests/auto/declarative/qquickgridview/data/footer.qml b/tests/auto/qtquick2/qquickgridview/data/footer.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/footer.qml rename to tests/auto/qtquick2/qquickgridview/data/footer.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview-enforcerange.qml b/tests/auto/qtquick2/qquickgridview/data/gridview-enforcerange.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/gridview-enforcerange.qml rename to tests/auto/qtquick2/qquickgridview/data/gridview-enforcerange.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview-initCurrent.qml b/tests/auto/qtquick2/qquickgridview/data/gridview-initCurrent.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/gridview-initCurrent.qml rename to tests/auto/qtquick2/qquickgridview/data/gridview-initCurrent.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview-noCurrent.qml b/tests/auto/qtquick2/qquickgridview/data/gridview-noCurrent.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/gridview-noCurrent.qml rename to tests/auto/qtquick2/qquickgridview/data/gridview-noCurrent.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview1.qml b/tests/auto/qtquick2/qquickgridview/data/gridview1.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/gridview1.qml rename to tests/auto/qtquick2/qquickgridview/data/gridview1.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview2.qml b/tests/auto/qtquick2/qquickgridview/data/gridview2.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/gridview2.qml rename to tests/auto/qtquick2/qquickgridview/data/gridview2.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview3.qml b/tests/auto/qtquick2/qquickgridview/data/gridview3.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/gridview3.qml rename to tests/auto/qtquick2/qquickgridview/data/gridview3.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview4.qml b/tests/auto/qtquick2/qquickgridview/data/gridview4.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/gridview4.qml rename to tests/auto/qtquick2/qquickgridview/data/gridview4.qml diff --git a/tests/auto/declarative/qquickgridview/data/header.qml b/tests/auto/qtquick2/qquickgridview/data/header.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/header.qml rename to tests/auto/qtquick2/qquickgridview/data/header.qml diff --git a/tests/auto/declarative/qquickgridview/data/manual-highlight.qml b/tests/auto/qtquick2/qquickgridview/data/manual-highlight.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/manual-highlight.qml rename to tests/auto/qtquick2/qquickgridview/data/manual-highlight.qml diff --git a/tests/auto/declarative/qquickgridview/data/margins.qml b/tests/auto/qtquick2/qquickgridview/data/margins.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/margins.qml rename to tests/auto/qtquick2/qquickgridview/data/margins.qml diff --git a/tests/auto/declarative/qquickgridview/data/mirroring.qml b/tests/auto/qtquick2/qquickgridview/data/mirroring.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/mirroring.qml rename to tests/auto/qtquick2/qquickgridview/data/mirroring.qml diff --git a/tests/auto/declarative/qquickgridview/data/propertychangestest.qml b/tests/auto/qtquick2/qquickgridview/data/propertychangestest.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/propertychangestest.qml rename to tests/auto/qtquick2/qquickgridview/data/propertychangestest.qml diff --git a/tests/auto/declarative/qquickgridview/data/resizeview.qml b/tests/auto/qtquick2/qquickgridview/data/resizeview.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/resizeview.qml rename to tests/auto/qtquick2/qquickgridview/data/resizeview.qml diff --git a/tests/auto/declarative/qquickgridview/data/setindex.qml b/tests/auto/qtquick2/qquickgridview/data/setindex.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/setindex.qml rename to tests/auto/qtquick2/qquickgridview/data/setindex.qml diff --git a/tests/auto/declarative/qquickgridview/data/snapToRow.qml b/tests/auto/qtquick2/qquickgridview/data/snapToRow.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/snapToRow.qml rename to tests/auto/qtquick2/qquickgridview/data/snapToRow.qml diff --git a/tests/auto/declarative/qquickgridview/data/unaligned.qml b/tests/auto/qtquick2/qquickgridview/data/unaligned.qml similarity index 100% rename from tests/auto/declarative/qquickgridview/data/unaligned.qml rename to tests/auto/qtquick2/qquickgridview/data/unaligned.qml diff --git a/tests/auto/declarative/qquickgridview/qquickgridview.pro b/tests/auto/qtquick2/qquickgridview/qquickgridview.pro similarity index 70% rename from tests/auto/declarative/qquickgridview/qquickgridview.pro rename to tests/auto/qtquick2/qquickgridview/qquickgridview.pro index c88b63a68e..b43e720162 100644 --- a/tests/auto/declarative/qquickgridview/qquickgridview.pro +++ b/tests/auto/qtquick2/qquickgridview/qquickgridview.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test CONFIG += insignificant_test #QTBUG-22807 -QT += core-private gui-private v8-private declarative-private opengl-private testlib widgets +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib widgets diff --git a/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp b/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp similarity index 99% rename from tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp rename to tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp index 503379ae42..cc0f7b7225 100644 --- a/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp @@ -41,18 +41,18 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include -#include -#include +#include +#include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include Q_DECLARE_METATYPE(Qt::LayoutDirection) diff --git a/tests/auto/declarative/qquickimage/data/aspectratio.qml b/tests/auto/qtquick2/qquickimage/data/aspectratio.qml similarity index 100% rename from tests/auto/declarative/qquickimage/data/aspectratio.qml rename to tests/auto/qtquick2/qquickimage/data/aspectratio.qml diff --git a/tests/auto/declarative/qquickimage/data/big.jpeg b/tests/auto/qtquick2/qquickimage/data/big.jpeg similarity index 100% rename from tests/auto/declarative/qquickimage/data/big.jpeg rename to tests/auto/qtquick2/qquickimage/data/big.jpeg diff --git a/tests/auto/declarative/qquickimage/data/big256.png b/tests/auto/qtquick2/qquickimage/data/big256.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/big256.png rename to tests/auto/qtquick2/qquickimage/data/big256.png diff --git a/tests/auto/declarative/qquickimage/data/colors.png b/tests/auto/qtquick2/qquickimage/data/colors.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/colors.png rename to tests/auto/qtquick2/qquickimage/data/colors.png diff --git a/tests/auto/declarative/qquickimage/data/colors1.png b/tests/auto/qtquick2/qquickimage/data/colors1.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/colors1.png rename to tests/auto/qtquick2/qquickimage/data/colors1.png diff --git a/tests/auto/declarative/qquickimage/data/green.png b/tests/auto/qtquick2/qquickimage/data/green.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/green.png rename to tests/auto/qtquick2/qquickimage/data/green.png diff --git a/tests/auto/declarative/qquickimage/data/heart-win32.png b/tests/auto/qtquick2/qquickimage/data/heart-win32.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/heart-win32.png rename to tests/auto/qtquick2/qquickimage/data/heart-win32.png diff --git a/tests/auto/declarative/qquickimage/data/heart.png b/tests/auto/qtquick2/qquickimage/data/heart.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/heart.png rename to tests/auto/qtquick2/qquickimage/data/heart.png diff --git a/tests/auto/declarative/qquickimage/data/heart.svg b/tests/auto/qtquick2/qquickimage/data/heart.svg similarity index 100% rename from tests/auto/declarative/qquickimage/data/heart.svg rename to tests/auto/qtquick2/qquickimage/data/heart.svg diff --git a/tests/auto/declarative/qquickimage/data/heart200-win32.png b/tests/auto/qtquick2/qquickimage/data/heart200-win32.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/heart200-win32.png rename to tests/auto/qtquick2/qquickimage/data/heart200-win32.png diff --git a/tests/auto/declarative/qquickimage/data/heart200.png b/tests/auto/qtquick2/qquickimage/data/heart200.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/heart200.png rename to tests/auto/qtquick2/qquickimage/data/heart200.png diff --git a/tests/auto/declarative/qquickimage/data/htiling.qml b/tests/auto/qtquick2/qquickimage/data/htiling.qml similarity index 100% rename from tests/auto/declarative/qquickimage/data/htiling.qml rename to tests/auto/qtquick2/qquickimage/data/htiling.qml diff --git a/tests/auto/declarative/qquickimage/data/mirror.qml b/tests/auto/qtquick2/qquickimage/data/mirror.qml similarity index 100% rename from tests/auto/declarative/qquickimage/data/mirror.qml rename to tests/auto/qtquick2/qquickimage/data/mirror.qml diff --git a/tests/auto/declarative/qquickimage/data/nullpixmap.qml b/tests/auto/qtquick2/qquickimage/data/nullpixmap.qml similarity index 100% rename from tests/auto/declarative/qquickimage/data/nullpixmap.qml rename to tests/auto/qtquick2/qquickimage/data/nullpixmap.qml diff --git a/tests/auto/declarative/qquickimage/data/pattern.png b/tests/auto/qtquick2/qquickimage/data/pattern.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/pattern.png rename to tests/auto/qtquick2/qquickimage/data/pattern.png diff --git a/tests/auto/declarative/qquickimage/data/qtbug_16389.qml b/tests/auto/qtquick2/qquickimage/data/qtbug_16389.qml similarity index 100% rename from tests/auto/declarative/qquickimage/data/qtbug_16389.qml rename to tests/auto/qtquick2/qquickimage/data/qtbug_16389.qml diff --git a/tests/auto/declarative/qquickimage/data/qtbug_22125.qml b/tests/auto/qtquick2/qquickimage/data/qtbug_22125.qml similarity index 100% rename from tests/auto/declarative/qquickimage/data/qtbug_22125.qml rename to tests/auto/qtquick2/qquickimage/data/qtbug_22125.qml diff --git a/tests/auto/declarative/qquickimage/data/rect.png b/tests/auto/qtquick2/qquickimage/data/rect.png similarity index 100% rename from tests/auto/declarative/qquickimage/data/rect.png rename to tests/auto/qtquick2/qquickimage/data/rect.png diff --git a/tests/auto/declarative/qquickimage/data/vtiling.qml b/tests/auto/qtquick2/qquickimage/data/vtiling.qml similarity index 100% rename from tests/auto/declarative/qquickimage/data/vtiling.qml rename to tests/auto/qtquick2/qquickimage/data/vtiling.qml diff --git a/tests/auto/qtquick2/qquickimage/qquickimage.pro b/tests/auto/qtquick2/qquickimage/qquickimage.pro new file mode 100644 index 0000000000..fd2af3b677 --- /dev/null +++ b/tests/auto/qtquick2/qquickimage/qquickimage.pro @@ -0,0 +1,13 @@ +CONFIG += testcase +TARGET = tst_qquickimage +macx:CONFIG -= app_bundle + +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquickimage.cpp ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickimage/tst_qquickimage.cpp b/tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp similarity index 99% rename from tests/auto/declarative/qquickimage/tst_qquickimage.cpp rename to tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp index 520c0fe5da..a7883626c6 100644 --- a/tests/auto/declarative/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include @@ -56,8 +56,8 @@ #include #include -#include "../shared/util.h" -#include "../shared/testhttpserver.h" +#include "../../shared/util.h" +#include "../../shared/testhttpserver.h" #define SERVER_PORT 14451 #define SERVER_ADDR "http://127.0.0.1:14451" diff --git a/tests/auto/declarative/qquickitem/data/order.1.qml b/tests/auto/qtquick2/qquickitem/data/order.1.qml similarity index 100% rename from tests/auto/declarative/qquickitem/data/order.1.qml rename to tests/auto/qtquick2/qquickitem/data/order.1.qml diff --git a/tests/auto/declarative/qquickitem/data/order.2.qml b/tests/auto/qtquick2/qquickitem/data/order.2.qml similarity index 100% rename from tests/auto/declarative/qquickitem/data/order.2.qml rename to tests/auto/qtquick2/qquickitem/data/order.2.qml diff --git a/tests/auto/declarative/qquickitem/qquickitem.pro b/tests/auto/qtquick2/qquickitem/qquickitem.pro similarity index 68% rename from tests/auto/declarative/qquickitem/qquickitem.pro rename to tests/auto/qtquick2/qquickitem/qquickitem.pro index f484bae014..2ebe76b09c 100644 --- a/tests/auto/declarative/qquickitem/qquickitem.pro +++ b/tests/auto/qtquick2/qquickitem/qquickitem.pro @@ -9,4 +9,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private widgets testlib +QT += core-private gui-private v8-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qquickitem/tst_qquickitem.cpp b/tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp similarity index 99% rename from tests/auto/declarative/qquickitem/tst_qquickitem.cpp rename to tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp index f8660540d9..fd7433b64e 100644 --- a/tests/auto/declarative/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp @@ -41,15 +41,15 @@ #include -#include "qquickitem.h" -#include "qquickcanvas.h" -#include "qquickview.h" +#include +#include +#include #include #include "private/qquickfocusscope_p.h" #include "private/qquickitem_p.h" #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class TestItem : public QQuickItem { diff --git a/tests/auto/declarative/qquickitem2/data/childrenProperty.qml b/tests/auto/qtquick2/qquickitem2/data/childrenProperty.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/childrenProperty.qml rename to tests/auto/qtquick2/qquickitem2/data/childrenProperty.qml diff --git a/tests/auto/declarative/qquickitem2/data/childrenRect.qml b/tests/auto/qtquick2/qquickitem2/data/childrenRect.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/childrenRect.qml rename to tests/auto/qtquick2/qquickitem2/data/childrenRect.qml diff --git a/tests/auto/declarative/qquickitem2/data/childrenRectBug.qml b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/childrenRectBug.qml rename to tests/auto/qtquick2/qquickitem2/data/childrenRectBug.qml diff --git a/tests/auto/declarative/qquickitem2/data/childrenRectBug2.qml b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug2.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/childrenRectBug2.qml rename to tests/auto/qtquick2/qquickitem2/data/childrenRectBug2.qml diff --git a/tests/auto/declarative/qquickitem2/data/childrenRectBug3.qml b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug3.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/childrenRectBug3.qml rename to tests/auto/qtquick2/qquickitem2/data/childrenRectBug3.qml diff --git a/tests/auto/declarative/qquickitem2/data/implicitsize.qml b/tests/auto/qtquick2/qquickitem2/data/implicitsize.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/implicitsize.qml rename to tests/auto/qtquick2/qquickitem2/data/implicitsize.qml diff --git a/tests/auto/declarative/qquickitem2/data/keynavigationtest.qml b/tests/auto/qtquick2/qquickitem2/data/keynavigationtest.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/keynavigationtest.qml rename to tests/auto/qtquick2/qquickitem2/data/keynavigationtest.qml diff --git a/tests/auto/declarative/qquickitem2/data/keynavigationtest_implicit.qml b/tests/auto/qtquick2/qquickitem2/data/keynavigationtest_implicit.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/keynavigationtest_implicit.qml rename to tests/auto/qtquick2/qquickitem2/data/keynavigationtest_implicit.qml diff --git a/tests/auto/declarative/qquickitem2/data/keyspriority.qml b/tests/auto/qtquick2/qquickitem2/data/keyspriority.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/keyspriority.qml rename to tests/auto/qtquick2/qquickitem2/data/keyspriority.qml diff --git a/tests/auto/declarative/qquickitem2/data/keystest.qml b/tests/auto/qtquick2/qquickitem2/data/keystest.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/keystest.qml rename to tests/auto/qtquick2/qquickitem2/data/keystest.qml diff --git a/tests/auto/declarative/qquickitem2/data/layoutmirroring.qml b/tests/auto/qtquick2/qquickitem2/data/layoutmirroring.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/layoutmirroring.qml rename to tests/auto/qtquick2/qquickitem2/data/layoutmirroring.qml diff --git a/tests/auto/declarative/qquickitem2/data/mapCoordinates.qml b/tests/auto/qtquick2/qquickitem2/data/mapCoordinates.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/mapCoordinates.qml rename to tests/auto/qtquick2/qquickitem2/data/mapCoordinates.qml diff --git a/tests/auto/declarative/qquickitem2/data/propertychanges.qml b/tests/auto/qtquick2/qquickitem2/data/propertychanges.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/propertychanges.qml rename to tests/auto/qtquick2/qquickitem2/data/propertychanges.qml diff --git a/tests/auto/declarative/qquickitem2/data/qtbug_16871.qml b/tests/auto/qtquick2/qquickitem2/data/qtbug_16871.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/qtbug_16871.qml rename to tests/auto/qtquick2/qquickitem2/data/qtbug_16871.qml diff --git a/tests/auto/declarative/qquickitem2/data/resourcesProperty.qml b/tests/auto/qtquick2/qquickitem2/data/resourcesProperty.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/resourcesProperty.qml rename to tests/auto/qtquick2/qquickitem2/data/resourcesProperty.qml diff --git a/tests/auto/declarative/qquickitem2/data/transformCrash.qml b/tests/auto/qtquick2/qquickitem2/data/transformCrash.qml similarity index 100% rename from tests/auto/declarative/qquickitem2/data/transformCrash.qml rename to tests/auto/qtquick2/qquickitem2/data/transformCrash.qml diff --git a/tests/auto/declarative/qquickitem2/qquickitem2.pro b/tests/auto/qtquick2/qquickitem2/qquickitem2.pro similarity index 67% rename from tests/auto/declarative/qquickitem2/qquickitem2.pro rename to tests/auto/qtquick2/qquickitem2/qquickitem2.pro index 2fe1eb1e3a..2a1d63633c 100644 --- a/tests/auto/declarative/qquickitem2/qquickitem2.pro +++ b/tests/auto/qtquick2/qquickitem2/qquickitem2.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qquickitem2/tst_qquickitem.cpp b/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp similarity index 99% rename from tests/auto/declarative/qquickitem2/tst_qquickitem.cpp rename to tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp index 3604128ccd..f04b9bac36 100644 --- a/tests/auto/declarative/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp @@ -43,10 +43,10 @@ #include #include #include -#include -#include +#include +#include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_QQuickItem : public QObject { diff --git a/tests/auto/declarative/qquicklistview/data/ComponentView.qml b/tests/auto/qtquick2/qquicklistview/data/ComponentView.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/ComponentView.qml rename to tests/auto/qtquick2/qquicklistview/data/ComponentView.qml diff --git a/tests/auto/declarative/qquicklistview/data/asyncloader.qml b/tests/auto/qtquick2/qquicklistview/data/asyncloader.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/asyncloader.qml rename to tests/auto/qtquick2/qquicklistview/data/asyncloader.qml diff --git a/tests/auto/declarative/qquicklistview/data/attachedSignals.qml b/tests/auto/qtquick2/qquicklistview/data/attachedSignals.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/attachedSignals.qml rename to tests/auto/qtquick2/qquicklistview/data/attachedSignals.qml diff --git a/tests/auto/declarative/qquicklistview/data/creationContext.qml b/tests/auto/qtquick2/qquicklistview/data/creationContext.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/creationContext.qml rename to tests/auto/qtquick2/qquicklistview/data/creationContext.qml diff --git a/tests/auto/declarative/qquicklistview/data/displaylist.qml b/tests/auto/qtquick2/qquicklistview/data/displaylist.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/displaylist.qml rename to tests/auto/qtquick2/qquicklistview/data/displaylist.qml diff --git a/tests/auto/declarative/qquicklistview/data/fillModelOnComponentCompleted.qml b/tests/auto/qtquick2/qquicklistview/data/fillModelOnComponentCompleted.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/fillModelOnComponentCompleted.qml rename to tests/auto/qtquick2/qquicklistview/data/fillModelOnComponentCompleted.qml diff --git a/tests/auto/declarative/qquicklistview/data/footer.qml b/tests/auto/qtquick2/qquicklistview/data/footer.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/footer.qml rename to tests/auto/qtquick2/qquicklistview/data/footer.qml diff --git a/tests/auto/declarative/qquicklistview/data/header.qml b/tests/auto/qtquick2/qquicklistview/data/header.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/header.qml rename to tests/auto/qtquick2/qquicklistview/data/header.qml diff --git a/tests/auto/declarative/qquicklistview/data/headerfooter.qml b/tests/auto/qtquick2/qquicklistview/data/headerfooter.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/headerfooter.qml rename to tests/auto/qtquick2/qquicklistview/data/headerfooter.qml diff --git a/tests/auto/declarative/qquicklistview/data/itemlist.qml b/tests/auto/qtquick2/qquicklistview/data/itemlist.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/itemlist.qml rename to tests/auto/qtquick2/qquicklistview/data/itemlist.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-enforcerange-nohighlight.qml b/tests/auto/qtquick2/qquicklistview/data/listview-enforcerange-nohighlight.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/listview-enforcerange-nohighlight.qml rename to tests/auto/qtquick2/qquicklistview/data/listview-enforcerange-nohighlight.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-enforcerange.qml b/tests/auto/qtquick2/qquicklistview/data/listview-enforcerange.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/listview-enforcerange.qml rename to tests/auto/qtquick2/qquicklistview/data/listview-enforcerange.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-initCurrent.qml b/tests/auto/qtquick2/qquicklistview/data/listview-initCurrent.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/listview-initCurrent.qml rename to tests/auto/qtquick2/qquicklistview/data/listview-initCurrent.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-noCurrent.qml b/tests/auto/qtquick2/qquicklistview/data/listview-noCurrent.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/listview-noCurrent.qml rename to tests/auto/qtquick2/qquicklistview/data/listview-noCurrent.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-sections.qml b/tests/auto/qtquick2/qquicklistview/data/listview-sections.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/listview-sections.qml rename to tests/auto/qtquick2/qquicklistview/data/listview-sections.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-sections_delegate.qml b/tests/auto/qtquick2/qquicklistview/data/listview-sections_delegate.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/listview-sections_delegate.qml rename to tests/auto/qtquick2/qquicklistview/data/listview-sections_delegate.qml diff --git a/tests/auto/declarative/qquicklistview/data/listviewtest.qml b/tests/auto/qtquick2/qquicklistview/data/listviewtest.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/listviewtest.qml rename to tests/auto/qtquick2/qquicklistview/data/listviewtest.qml diff --git a/tests/auto/declarative/qquicklistview/data/manual-highlight.qml b/tests/auto/qtquick2/qquicklistview/data/manual-highlight.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/manual-highlight.qml rename to tests/auto/qtquick2/qquicklistview/data/manual-highlight.qml diff --git a/tests/auto/declarative/qquicklistview/data/margins.qml b/tests/auto/qtquick2/qquicklistview/data/margins.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/margins.qml rename to tests/auto/qtquick2/qquicklistview/data/margins.qml diff --git a/tests/auto/declarative/qquicklistview/data/propertychangestest.qml b/tests/auto/qtquick2/qquicklistview/data/propertychangestest.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/propertychangestest.qml rename to tests/auto/qtquick2/qquicklistview/data/propertychangestest.qml diff --git a/tests/auto/declarative/qquicklistview/data/qtbug-21742.qml b/tests/auto/qtquick2/qquicklistview/data/qtbug-21742.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/qtbug-21742.qml rename to tests/auto/qtquick2/qquicklistview/data/qtbug-21742.qml diff --git a/tests/auto/declarative/qquicklistview/data/qtbug14821.qml b/tests/auto/qtquick2/qquicklistview/data/qtbug14821.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/qtbug14821.qml rename to tests/auto/qtquick2/qquicklistview/data/qtbug14821.qml diff --git a/tests/auto/declarative/qquicklistview/data/qtbug16037.qml b/tests/auto/qtquick2/qquicklistview/data/qtbug16037.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/qtbug16037.qml rename to tests/auto/qtquick2/qquicklistview/data/qtbug16037.qml diff --git a/tests/auto/declarative/qquicklistview/data/resizeview.qml b/tests/auto/qtquick2/qquicklistview/data/resizeview.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/resizeview.qml rename to tests/auto/qtquick2/qquicklistview/data/resizeview.qml diff --git a/tests/auto/declarative/qquicklistview/data/rightToLeft.qml b/tests/auto/qtquick2/qquicklistview/data/rightToLeft.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/rightToLeft.qml rename to tests/auto/qtquick2/qquicklistview/data/rightToLeft.qml diff --git a/tests/auto/declarative/qquicklistview/data/sizelessthan1.qml b/tests/auto/qtquick2/qquicklistview/data/sizelessthan1.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/sizelessthan1.qml rename to tests/auto/qtquick2/qquicklistview/data/sizelessthan1.qml diff --git a/tests/auto/declarative/qquicklistview/data/snapToItem.qml b/tests/auto/qtquick2/qquicklistview/data/snapToItem.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/snapToItem.qml rename to tests/auto/qtquick2/qquicklistview/data/snapToItem.qml diff --git a/tests/auto/declarative/qquicklistview/data/strictlyenforcerange.qml b/tests/auto/qtquick2/qquicklistview/data/strictlyenforcerange.qml similarity index 100% rename from tests/auto/declarative/qquicklistview/data/strictlyenforcerange.qml rename to tests/auto/qtquick2/qquicklistview/data/strictlyenforcerange.qml diff --git a/tests/auto/declarative/qquicklistview/incrementalmodel.cpp b/tests/auto/qtquick2/qquicklistview/incrementalmodel.cpp similarity index 100% rename from tests/auto/declarative/qquicklistview/incrementalmodel.cpp rename to tests/auto/qtquick2/qquicklistview/incrementalmodel.cpp diff --git a/tests/auto/declarative/qquicklistview/incrementalmodel.h b/tests/auto/qtquick2/qquicklistview/incrementalmodel.h similarity index 100% rename from tests/auto/declarative/qquicklistview/incrementalmodel.h rename to tests/auto/qtquick2/qquicklistview/incrementalmodel.h diff --git a/tests/auto/declarative/qquicklistview/qquicklistview.pro b/tests/auto/qtquick2/qquicklistview/qquicklistview.pro similarity index 68% rename from tests/auto/declarative/qquicklistview/qquicklistview.pro rename to tests/auto/qtquick2/qquicklistview/qquicklistview.pro index 3ffd3a7dc6..be88679c62 100644 --- a/tests/auto/declarative/qquicklistview/qquicklistview.pro +++ b/tests/auto/qtquick2/qquicklistview/qquicklistview.pro @@ -10,4 +10,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private widgets widgets-private v8-private opengl-private testlib +QT += core-private gui-private declarative-private quick-private widgets widgets-private v8-private opengl-private testlib diff --git a/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp similarity index 99% rename from tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp rename to tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp index 3b41600eb6..780033bbeb 100644 --- a/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp @@ -41,19 +41,19 @@ #include #include -#include +#include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include "../shared/util.h" +#include +#include "../../shared/util.h" #include "incrementalmodel.h" #include diff --git a/tests/auto/declarative/qquickloader/data/ActiveComponent.qml b/tests/auto/qtquick2/qquickloader/data/ActiveComponent.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/ActiveComponent.qml rename to tests/auto/qtquick2/qquickloader/data/ActiveComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/AnchoredLoader.qml b/tests/auto/qtquick2/qquickloader/data/AnchoredLoader.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/AnchoredLoader.qml rename to tests/auto/qtquick2/qquickloader/data/AnchoredLoader.qml diff --git a/tests/auto/declarative/qquickloader/data/BigComponent.qml b/tests/auto/qtquick2/qquickloader/data/BigComponent.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/BigComponent.qml rename to tests/auto/qtquick2/qquickloader/data/BigComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/BlueRect.qml b/tests/auto/qtquick2/qquickloader/data/BlueRect.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/BlueRect.qml rename to tests/auto/qtquick2/qquickloader/data/BlueRect.qml diff --git a/tests/auto/declarative/qquickloader/data/CreationContextLoader.qml b/tests/auto/qtquick2/qquickloader/data/CreationContextLoader.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/CreationContextLoader.qml rename to tests/auto/qtquick2/qquickloader/data/CreationContextLoader.qml diff --git a/tests/auto/declarative/qquickloader/data/GraphicsWidget250x250.qml b/tests/auto/qtquick2/qquickloader/data/GraphicsWidget250x250.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/GraphicsWidget250x250.qml rename to tests/auto/qtquick2/qquickloader/data/GraphicsWidget250x250.qml diff --git a/tests/auto/declarative/qquickloader/data/GreenRect.qml b/tests/auto/qtquick2/qquickloader/data/GreenRect.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/GreenRect.qml rename to tests/auto/qtquick2/qquickloader/data/GreenRect.qml diff --git a/tests/auto/declarative/qquickloader/data/InitialPropertyValuesComponent.qml b/tests/auto/qtquick2/qquickloader/data/InitialPropertyValuesComponent.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/InitialPropertyValuesComponent.qml rename to tests/auto/qtquick2/qquickloader/data/InitialPropertyValuesComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/InvalidSourceComponent.qml b/tests/auto/qtquick2/qquickloader/data/InvalidSourceComponent.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/InvalidSourceComponent.qml rename to tests/auto/qtquick2/qquickloader/data/InvalidSourceComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/NoResize.qml b/tests/auto/qtquick2/qquickloader/data/NoResize.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/NoResize.qml rename to tests/auto/qtquick2/qquickloader/data/NoResize.qml diff --git a/tests/auto/declarative/qquickloader/data/NoResizeGraphicsWidget.qml b/tests/auto/qtquick2/qquickloader/data/NoResizeGraphicsWidget.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/NoResizeGraphicsWidget.qml rename to tests/auto/qtquick2/qquickloader/data/NoResizeGraphicsWidget.qml diff --git a/tests/auto/declarative/qquickloader/data/QTBUG_16928.qml b/tests/auto/qtquick2/qquickloader/data/QTBUG_16928.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/QTBUG_16928.qml rename to tests/auto/qtquick2/qquickloader/data/QTBUG_16928.qml diff --git a/tests/auto/declarative/qquickloader/data/QTBUG_17114.qml b/tests/auto/qtquick2/qquickloader/data/QTBUG_17114.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/QTBUG_17114.qml rename to tests/auto/qtquick2/qquickloader/data/QTBUG_17114.qml diff --git a/tests/auto/declarative/qquickloader/data/Rect120x60.qml b/tests/auto/qtquick2/qquickloader/data/Rect120x60.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/Rect120x60.qml rename to tests/auto/qtquick2/qquickloader/data/Rect120x60.qml diff --git a/tests/auto/declarative/qquickloader/data/SetSourceComponent.qml b/tests/auto/qtquick2/qquickloader/data/SetSourceComponent.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/SetSourceComponent.qml rename to tests/auto/qtquick2/qquickloader/data/SetSourceComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/SizeGraphicsWidgetToLoader.qml b/tests/auto/qtquick2/qquickloader/data/SizeGraphicsWidgetToLoader.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/SizeGraphicsWidgetToLoader.qml rename to tests/auto/qtquick2/qquickloader/data/SizeGraphicsWidgetToLoader.qml diff --git a/tests/auto/declarative/qquickloader/data/SizeLoaderToGraphicsWidget.qml b/tests/auto/qtquick2/qquickloader/data/SizeLoaderToGraphicsWidget.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/SizeLoaderToGraphicsWidget.qml rename to tests/auto/qtquick2/qquickloader/data/SizeLoaderToGraphicsWidget.qml diff --git a/tests/auto/declarative/qquickloader/data/SizeToItem.qml b/tests/auto/qtquick2/qquickloader/data/SizeToItem.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/SizeToItem.qml rename to tests/auto/qtquick2/qquickloader/data/SizeToItem.qml diff --git a/tests/auto/declarative/qquickloader/data/SizeToLoader.qml b/tests/auto/qtquick2/qquickloader/data/SizeToLoader.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/SizeToLoader.qml rename to tests/auto/qtquick2/qquickloader/data/SizeToLoader.qml diff --git a/tests/auto/declarative/qquickloader/data/VmeError.qml b/tests/auto/qtquick2/qquickloader/data/VmeError.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/VmeError.qml rename to tests/auto/qtquick2/qquickloader/data/VmeError.qml diff --git a/tests/auto/declarative/qquickloader/data/active.1.qml b/tests/auto/qtquick2/qquickloader/data/active.1.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/active.1.qml rename to tests/auto/qtquick2/qquickloader/data/active.1.qml diff --git a/tests/auto/declarative/qquickloader/data/active.2.qml b/tests/auto/qtquick2/qquickloader/data/active.2.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/active.2.qml rename to tests/auto/qtquick2/qquickloader/data/active.2.qml diff --git a/tests/auto/declarative/qquickloader/data/active.3.qml b/tests/auto/qtquick2/qquickloader/data/active.3.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/active.3.qml rename to tests/auto/qtquick2/qquickloader/data/active.3.qml diff --git a/tests/auto/declarative/qquickloader/data/active.4.qml b/tests/auto/qtquick2/qquickloader/data/active.4.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/active.4.qml rename to tests/auto/qtquick2/qquickloader/data/active.4.qml diff --git a/tests/auto/declarative/qquickloader/data/active.5.qml b/tests/auto/qtquick2/qquickloader/data/active.5.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/active.5.qml rename to tests/auto/qtquick2/qquickloader/data/active.5.qml diff --git a/tests/auto/declarative/qquickloader/data/active.6.qml b/tests/auto/qtquick2/qquickloader/data/active.6.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/active.6.qml rename to tests/auto/qtquick2/qquickloader/data/active.6.qml diff --git a/tests/auto/declarative/qquickloader/data/active.7.qml b/tests/auto/qtquick2/qquickloader/data/active.7.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/active.7.qml rename to tests/auto/qtquick2/qquickloader/data/active.7.qml diff --git a/tests/auto/declarative/qquickloader/data/active.8.qml b/tests/auto/qtquick2/qquickloader/data/active.8.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/active.8.qml rename to tests/auto/qtquick2/qquickloader/data/active.8.qml diff --git a/tests/auto/declarative/qquickloader/data/asynchronous.qml b/tests/auto/qtquick2/qquickloader/data/asynchronous.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/asynchronous.qml rename to tests/auto/qtquick2/qquickloader/data/asynchronous.qml diff --git a/tests/auto/declarative/qquickloader/data/crash.qml b/tests/auto/qtquick2/qquickloader/data/crash.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/crash.qml rename to tests/auto/qtquick2/qquickloader/data/crash.qml diff --git a/tests/auto/declarative/qquickloader/data/creationContext.qml b/tests/auto/qtquick2/qquickloader/data/creationContext.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/creationContext.qml rename to tests/auto/qtquick2/qquickloader/data/creationContext.qml diff --git a/tests/auto/declarative/qquickloader/data/differentorigin.qml b/tests/auto/qtquick2/qquickloader/data/differentorigin.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/differentorigin.qml rename to tests/auto/qtquick2/qquickloader/data/differentorigin.qml diff --git a/tests/auto/declarative/qquickloader/data/implicitSize.qml b/tests/auto/qtquick2/qquickloader/data/implicitSize.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/implicitSize.qml rename to tests/auto/qtquick2/qquickloader/data/implicitSize.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.1.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.1.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.1.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.1.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.2.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.2.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.2.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.2.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.3.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.3.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.3.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.3.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.4.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.4.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.4.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.4.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.5.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.5.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.5.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.5.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.6.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.6.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.6.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.6.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.7.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.7.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.7.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.7.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.8.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.8.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.8.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.8.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.binding.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.binding.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.binding.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.binding.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.1.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.1.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.1.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.1.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.2.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.2.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.2.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.2.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.3.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.3.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.3.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.3.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.4.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.4.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.4.qml rename to tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.4.qml diff --git a/tests/auto/declarative/qquickloader/data/nonItem.qml b/tests/auto/qtquick2/qquickloader/data/nonItem.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/nonItem.qml rename to tests/auto/qtquick2/qquickloader/data/nonItem.qml diff --git a/tests/auto/declarative/qquickloader/data/parented.qml b/tests/auto/qtquick2/qquickloader/data/parented.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/parented.qml rename to tests/auto/qtquick2/qquickloader/data/parented.qml diff --git a/tests/auto/declarative/qquickloader/data/qmldir b/tests/auto/qtquick2/qquickloader/data/qmldir similarity index 100% rename from tests/auto/declarative/qquickloader/data/qmldir rename to tests/auto/qtquick2/qquickloader/data/qmldir diff --git a/tests/auto/declarative/qquickloader/data/sameorigin-load.qml b/tests/auto/qtquick2/qquickloader/data/sameorigin-load.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/sameorigin-load.qml rename to tests/auto/qtquick2/qquickloader/data/sameorigin-load.qml diff --git a/tests/auto/declarative/qquickloader/data/sameorigin.qml b/tests/auto/qtquick2/qquickloader/data/sameorigin.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/sameorigin.qml rename to tests/auto/qtquick2/qquickloader/data/sameorigin.qml diff --git a/tests/auto/declarative/qquickloader/data/vmeErrors.qml b/tests/auto/qtquick2/qquickloader/data/vmeErrors.qml similarity index 100% rename from tests/auto/declarative/qquickloader/data/vmeErrors.qml rename to tests/auto/qtquick2/qquickloader/data/vmeErrors.qml diff --git a/tests/auto/declarative/qquickloader/qquickloader.pro b/tests/auto/qtquick2/qquickloader/qquickloader.pro similarity index 52% rename from tests/auto/declarative/qquickloader/qquickloader.pro rename to tests/auto/qtquick2/qquickloader/qquickloader.pro index 9ccecce478..6e372692c2 100644 --- a/tests/auto/declarative/qquickloader/qquickloader.pro +++ b/tests/auto/qtquick2/qquickloader/qquickloader.pro @@ -2,10 +2,10 @@ CONFIG += testcase TARGET = tst_qquickloader macx:CONFIG -= app_bundle -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qquickloader.cpp \ - ../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp testDataFiles.files = data testDataFiles.path = . @@ -13,4 +13,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickloader/tst_qquickloader.cpp b/tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp similarity index 99% rename from tests/auto/declarative/qquickloader/tst_qquickloader.cpp rename to tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp index 96d0d88a84..3df692a6a6 100644 --- a/tests/auto/declarative/qquickloader/tst_qquickloader.cpp +++ b/tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp @@ -47,7 +47,7 @@ #include #include #include "testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/util.h" #define SERVER_PORT 14450 diff --git a/tests/auto/declarative/qquickmousearea/data/clickThrough.qml b/tests/auto/qtquick2/qquickmousearea/data/clickThrough.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/clickThrough.qml rename to tests/auto/qtquick2/qquickmousearea/data/clickThrough.qml diff --git a/tests/auto/declarative/qquickmousearea/data/clickThrough2.qml b/tests/auto/qtquick2/qquickmousearea/data/clickThrough2.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/clickThrough2.qml rename to tests/auto/qtquick2/qquickmousearea/data/clickThrough2.qml diff --git a/tests/auto/declarative/qquickmousearea/data/clickandhold.qml b/tests/auto/qtquick2/qquickmousearea/data/clickandhold.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/clickandhold.qml rename to tests/auto/qtquick2/qquickmousearea/data/clickandhold.qml diff --git a/tests/auto/declarative/qquickmousearea/data/clicktwice.qml b/tests/auto/qtquick2/qquickmousearea/data/clicktwice.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/clicktwice.qml rename to tests/auto/qtquick2/qquickmousearea/data/clicktwice.qml diff --git a/tests/auto/declarative/qquickmousearea/data/doubleclick.qml b/tests/auto/qtquick2/qquickmousearea/data/doubleclick.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/doubleclick.qml rename to tests/auto/qtquick2/qquickmousearea/data/doubleclick.qml diff --git a/tests/auto/declarative/qquickmousearea/data/dragging.qml b/tests/auto/qtquick2/qquickmousearea/data/dragging.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/dragging.qml rename to tests/auto/qtquick2/qquickmousearea/data/dragging.qml diff --git a/tests/auto/declarative/qquickmousearea/data/dragproperties.qml b/tests/auto/qtquick2/qquickmousearea/data/dragproperties.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/dragproperties.qml rename to tests/auto/qtquick2/qquickmousearea/data/dragproperties.qml diff --git a/tests/auto/declarative/qquickmousearea/data/dragreset.qml b/tests/auto/qtquick2/qquickmousearea/data/dragreset.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/dragreset.qml rename to tests/auto/qtquick2/qquickmousearea/data/dragreset.qml diff --git a/tests/auto/declarative/qquickmousearea/data/hoverPosition.qml b/tests/auto/qtquick2/qquickmousearea/data/hoverPosition.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/hoverPosition.qml rename to tests/auto/qtquick2/qquickmousearea/data/hoverPosition.qml diff --git a/tests/auto/declarative/qquickmousearea/data/hoverPropagation.qml b/tests/auto/qtquick2/qquickmousearea/data/hoverPropagation.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/hoverPropagation.qml rename to tests/auto/qtquick2/qquickmousearea/data/hoverPropagation.qml diff --git a/tests/auto/declarative/qquickmousearea/data/noclickandhold.qml b/tests/auto/qtquick2/qquickmousearea/data/noclickandhold.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/noclickandhold.qml rename to tests/auto/qtquick2/qquickmousearea/data/noclickandhold.qml diff --git a/tests/auto/declarative/qquickmousearea/data/pressedCanceled.qml b/tests/auto/qtquick2/qquickmousearea/data/pressedCanceled.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/pressedCanceled.qml rename to tests/auto/qtquick2/qquickmousearea/data/pressedCanceled.qml diff --git a/tests/auto/declarative/qquickmousearea/data/pressedOrdering.qml b/tests/auto/qtquick2/qquickmousearea/data/pressedOrdering.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/pressedOrdering.qml rename to tests/auto/qtquick2/qquickmousearea/data/pressedOrdering.qml diff --git a/tests/auto/declarative/qquickmousearea/data/preventstealing.qml b/tests/auto/qtquick2/qquickmousearea/data/preventstealing.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/preventstealing.qml rename to tests/auto/qtquick2/qquickmousearea/data/preventstealing.qml diff --git a/tests/auto/declarative/qquickmousearea/data/rejectEvent.qml b/tests/auto/qtquick2/qquickmousearea/data/rejectEvent.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/rejectEvent.qml rename to tests/auto/qtquick2/qquickmousearea/data/rejectEvent.qml diff --git a/tests/auto/declarative/qquickmousearea/data/updateMousePosOnClick.qml b/tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnClick.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/updateMousePosOnClick.qml rename to tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnClick.qml diff --git a/tests/auto/declarative/qquickmousearea/data/updateMousePosOnResize.qml b/tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnResize.qml similarity index 100% rename from tests/auto/declarative/qquickmousearea/data/updateMousePosOnResize.qml rename to tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnResize.qml diff --git a/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro b/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro new file mode 100644 index 0000000000..fcf166b0ed --- /dev/null +++ b/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro @@ -0,0 +1,14 @@ +CONFIG += testcase +TARGET = tst_qquickmousearea +macx:CONFIG -= app_bundle + +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquickmousearea.cpp ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp similarity index 99% rename from tests/auto/declarative/qquickmousearea/tst_qquickmousearea.cpp rename to tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp index ac1eea7a41..7c9af4ba64 100644 --- a/tests/auto/declarative/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp @@ -41,14 +41,14 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" //#define OLDWAY diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/inFlickable.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml similarity index 100% rename from tests/auto/declarative/qquickmultipointtoucharea/data/inFlickable.qml rename to tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/nested.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/nested.qml similarity index 100% rename from tests/auto/declarative/qquickmultipointtoucharea/data/nested.qml rename to tests/auto/qtquick2/qquickmultipointtoucharea/data/nested.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/nonOverlapping.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/nonOverlapping.qml similarity index 100% rename from tests/auto/declarative/qquickmultipointtoucharea/data/nonOverlapping.qml rename to tests/auto/qtquick2/qquickmultipointtoucharea/data/nonOverlapping.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/properties.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/properties.qml similarity index 100% rename from tests/auto/declarative/qquickmultipointtoucharea/data/properties.qml rename to tests/auto/qtquick2/qquickmultipointtoucharea/data/properties.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/signalTest.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml similarity index 100% rename from tests/auto/declarative/qquickmultipointtoucharea/data/signalTest.qml rename to tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/qquickmultipointtoucharea.pro b/tests/auto/qtquick2/qquickmultipointtoucharea/qquickmultipointtoucharea.pro similarity index 73% rename from tests/auto/declarative/qquickmultipointtoucharea/qquickmultipointtoucharea.pro rename to tests/auto/qtquick2/qquickmultipointtoucharea/qquickmultipointtoucharea.pro index 8be4b1f1fd..38c32099b0 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/qquickmultipointtoucharea.pro +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/qquickmultipointtoucharea.pro @@ -8,4 +8,4 @@ importFiles.files = data importFiles.path = . DEPLOYMENT += importFiles -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/qtquick2/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp similarity index 99% rename from tests/auto/declarative/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp rename to tests/auto/qtquick2/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp index 9acef50645..b4fca9bb9e 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include class tst_QQuickMultiPointTouchArea: public QObject { diff --git a/tests/auto/declarative/qquickpathview/data/ComponentView.qml b/tests/auto/qtquick2/qquickpathview/data/ComponentView.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/ComponentView.qml rename to tests/auto/qtquick2/qquickpathview/data/ComponentView.qml diff --git a/tests/auto/declarative/qquickpathview/data/asyncloader.qml b/tests/auto/qtquick2/qquickpathview/data/asyncloader.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/asyncloader.qml rename to tests/auto/qtquick2/qquickpathview/data/asyncloader.qml diff --git a/tests/auto/declarative/qquickpathview/data/closedPath.qml b/tests/auto/qtquick2/qquickpathview/data/closedPath.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/closedPath.qml rename to tests/auto/qtquick2/qquickpathview/data/closedPath.qml diff --git a/tests/auto/declarative/qquickpathview/data/creationContext.qml b/tests/auto/qtquick2/qquickpathview/data/creationContext.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/creationContext.qml rename to tests/auto/qtquick2/qquickpathview/data/creationContext.qml diff --git a/tests/auto/declarative/qquickpathview/data/datamodel.qml b/tests/auto/qtquick2/qquickpathview/data/datamodel.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/datamodel.qml rename to tests/auto/qtquick2/qquickpathview/data/datamodel.qml diff --git a/tests/auto/declarative/qquickpathview/data/displaypath.qml b/tests/auto/qtquick2/qquickpathview/data/displaypath.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/displaypath.qml rename to tests/auto/qtquick2/qquickpathview/data/displaypath.qml diff --git a/tests/auto/declarative/qquickpathview/data/dragpath.qml b/tests/auto/qtquick2/qquickpathview/data/dragpath.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/dragpath.qml rename to tests/auto/qtquick2/qquickpathview/data/dragpath.qml diff --git a/tests/auto/declarative/qquickpathview/data/emptymodel.qml b/tests/auto/qtquick2/qquickpathview/data/emptymodel.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/emptymodel.qml rename to tests/auto/qtquick2/qquickpathview/data/emptymodel.qml diff --git a/tests/auto/declarative/qquickpathview/data/missingPercent.qml b/tests/auto/qtquick2/qquickpathview/data/missingPercent.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/missingPercent.qml rename to tests/auto/qtquick2/qquickpathview/data/missingPercent.qml diff --git a/tests/auto/declarative/qquickpathview/data/openPath.qml b/tests/auto/qtquick2/qquickpathview/data/openPath.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/openPath.qml rename to tests/auto/qtquick2/qquickpathview/data/openPath.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathUpdate.qml b/tests/auto/qtquick2/qquickpathview/data/pathUpdate.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathUpdate.qml rename to tests/auto/qtquick2/qquickpathview/data/pathUpdate.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathUpdateOnStartChanged.qml b/tests/auto/qtquick2/qquickpathview/data/pathUpdateOnStartChanged.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathUpdateOnStartChanged.qml rename to tests/auto/qtquick2/qquickpathview/data/pathUpdateOnStartChanged.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathline.qml b/tests/auto/qtquick2/qquickpathview/data/pathline.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathline.qml rename to tests/auto/qtquick2/qquickpathview/data/pathline.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathtest.qml b/tests/auto/qtquick2/qquickpathview/data/pathtest.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathtest.qml rename to tests/auto/qtquick2/qquickpathview/data/pathtest.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview0.qml b/tests/auto/qtquick2/qquickpathview/data/pathview0.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathview0.qml rename to tests/auto/qtquick2/qquickpathview/data/pathview0.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview1.qml b/tests/auto/qtquick2/qquickpathview/data/pathview1.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathview1.qml rename to tests/auto/qtquick2/qquickpathview/data/pathview1.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview2.qml b/tests/auto/qtquick2/qquickpathview/data/pathview2.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathview2.qml rename to tests/auto/qtquick2/qquickpathview/data/pathview2.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview3.qml b/tests/auto/qtquick2/qquickpathview/data/pathview3.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathview3.qml rename to tests/auto/qtquick2/qquickpathview/data/pathview3.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview_package.qml b/tests/auto/qtquick2/qquickpathview/data/pathview_package.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/pathview_package.qml rename to tests/auto/qtquick2/qquickpathview/data/pathview_package.qml diff --git a/tests/auto/declarative/qquickpathview/data/propertychanges.qml b/tests/auto/qtquick2/qquickpathview/data/propertychanges.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/propertychanges.qml rename to tests/auto/qtquick2/qquickpathview/data/propertychanges.qml diff --git a/tests/auto/declarative/qquickpathview/data/treemodel.qml b/tests/auto/qtquick2/qquickpathview/data/treemodel.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/treemodel.qml rename to tests/auto/qtquick2/qquickpathview/data/treemodel.qml diff --git a/tests/auto/declarative/qquickpathview/data/undefinedpath.qml b/tests/auto/qtquick2/qquickpathview/data/undefinedpath.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/undefinedpath.qml rename to tests/auto/qtquick2/qquickpathview/data/undefinedpath.qml diff --git a/tests/auto/declarative/qquickpathview/data/vdm.qml b/tests/auto/qtquick2/qquickpathview/data/vdm.qml similarity index 100% rename from tests/auto/declarative/qquickpathview/data/vdm.qml rename to tests/auto/qtquick2/qquickpathview/data/vdm.qml diff --git a/tests/auto/declarative/qquickpathview/qquickpathview.pro b/tests/auto/qtquick2/qquickpathview/qquickpathview.pro similarity index 69% rename from tests/auto/declarative/qquickpathview/qquickpathview.pro rename to tests/auto/qtquick2/qquickpathview/qquickpathview.pro index d03cd4eec7..6e16dd4879 100644 --- a/tests/auto/declarative/qquickpathview/qquickpathview.pro +++ b/tests/auto/qtquick2/qquickpathview/qquickpathview.pro @@ -9,4 +9,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private widgets testlib +QT += core-private gui-private v8-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qquickpathview/tst_qquickpathview.cpp b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp similarity index 99% rename from tests/auto/declarative/qquickpathview/tst_qquickpathview.cpp rename to tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp index b0efc5838d..2f1d836c72 100644 --- a/tests/auto/declarative/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp @@ -40,16 +40,16 @@ ****************************************************************************/ #include -#include +#include #include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -57,7 +57,7 @@ #include #include -#include "../shared/util.h" +#include "../../shared/util.h" static void initStandardTreeModel(QStandardItemModel *model) { diff --git a/tests/auto/declarative/qquickpincharea/data/pinchproperties.qml b/tests/auto/qtquick2/qquickpincharea/data/pinchproperties.qml similarity index 100% rename from tests/auto/declarative/qquickpincharea/data/pinchproperties.qml rename to tests/auto/qtquick2/qquickpincharea/data/pinchproperties.qml diff --git a/tests/auto/declarative/qquickpincharea/qquickpincharea.pro b/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro similarity index 74% rename from tests/auto/declarative/qquickpincharea/qquickpincharea.pro rename to tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro index df750fb2f6..6e2ff59512 100644 --- a/tests/auto/declarative/qquickpincharea/qquickpincharea.pro +++ b/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp similarity index 99% rename from tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp rename to tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp index 0d6126e671..c4912c46f1 100644 --- a/tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp +++ b/tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp @@ -42,10 +42,10 @@ #include #include #include -#include -#include +#include +#include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_QQuickPinchArea: public QObject { diff --git a/tests/auto/declarative/qquickpositioners/data/allInvisible.qml b/tests/auto/qtquick2/qquickpositioners/data/allInvisible.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/allInvisible.qml rename to tests/auto/qtquick2/qquickpositioners/data/allInvisible.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-column.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-column.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/attachedproperties-column.qml rename to tests/auto/qtquick2/qquickpositioners/data/attachedproperties-column.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-dynamic.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-dynamic.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/attachedproperties-dynamic.qml rename to tests/auto/qtquick2/qquickpositioners/data/attachedproperties-dynamic.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-flow.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-flow.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/attachedproperties-flow.qml rename to tests/auto/qtquick2/qquickpositioners/data/attachedproperties-flow.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-grid.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-grid.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/attachedproperties-grid.qml rename to tests/auto/qtquick2/qquickpositioners/data/attachedproperties-grid.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-row.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-row.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/attachedproperties-row.qml rename to tests/auto/qtquick2/qquickpositioners/data/attachedproperties-row.qml diff --git a/tests/auto/declarative/qquickpositioners/data/flow-testimplicitsize.qml b/tests/auto/qtquick2/qquickpositioners/data/flow-testimplicitsize.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/flow-testimplicitsize.qml rename to tests/auto/qtquick2/qquickpositioners/data/flow-testimplicitsize.qml diff --git a/tests/auto/declarative/qquickpositioners/data/flowtest-toptobottom.qml b/tests/auto/qtquick2/qquickpositioners/data/flowtest-toptobottom.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/flowtest-toptobottom.qml rename to tests/auto/qtquick2/qquickpositioners/data/flowtest-toptobottom.qml diff --git a/tests/auto/declarative/qquickpositioners/data/flowtest.qml b/tests/auto/qtquick2/qquickpositioners/data/flowtest.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/flowtest.qml rename to tests/auto/qtquick2/qquickpositioners/data/flowtest.qml diff --git a/tests/auto/declarative/qquickpositioners/data/grid-animated.qml b/tests/auto/qtquick2/qquickpositioners/data/grid-animated.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/grid-animated.qml rename to tests/auto/qtquick2/qquickpositioners/data/grid-animated.qml diff --git a/tests/auto/declarative/qquickpositioners/data/grid-row-column-spacing.qml b/tests/auto/qtquick2/qquickpositioners/data/grid-row-column-spacing.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/grid-row-column-spacing.qml rename to tests/auto/qtquick2/qquickpositioners/data/grid-row-column-spacing.qml diff --git a/tests/auto/declarative/qquickpositioners/data/grid-spacing.qml b/tests/auto/qtquick2/qquickpositioners/data/grid-spacing.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/grid-spacing.qml rename to tests/auto/qtquick2/qquickpositioners/data/grid-spacing.qml diff --git a/tests/auto/declarative/qquickpositioners/data/grid-toptobottom.qml b/tests/auto/qtquick2/qquickpositioners/data/grid-toptobottom.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/grid-toptobottom.qml rename to tests/auto/qtquick2/qquickpositioners/data/grid-toptobottom.qml diff --git a/tests/auto/declarative/qquickpositioners/data/gridtest.qml b/tests/auto/qtquick2/qquickpositioners/data/gridtest.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/gridtest.qml rename to tests/auto/qtquick2/qquickpositioners/data/gridtest.qml diff --git a/tests/auto/declarative/qquickpositioners/data/gridzerocolumns.qml b/tests/auto/qtquick2/qquickpositioners/data/gridzerocolumns.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/gridzerocolumns.qml rename to tests/auto/qtquick2/qquickpositioners/data/gridzerocolumns.qml diff --git a/tests/auto/declarative/qquickpositioners/data/horizontal-animated-disabled.qml b/tests/auto/qtquick2/qquickpositioners/data/horizontal-animated-disabled.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/horizontal-animated-disabled.qml rename to tests/auto/qtquick2/qquickpositioners/data/horizontal-animated-disabled.qml diff --git a/tests/auto/declarative/qquickpositioners/data/horizontal-animated.qml b/tests/auto/qtquick2/qquickpositioners/data/horizontal-animated.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/horizontal-animated.qml rename to tests/auto/qtquick2/qquickpositioners/data/horizontal-animated.qml diff --git a/tests/auto/declarative/qquickpositioners/data/horizontal-spacing.qml b/tests/auto/qtquick2/qquickpositioners/data/horizontal-spacing.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/horizontal-spacing.qml rename to tests/auto/qtquick2/qquickpositioners/data/horizontal-spacing.qml diff --git a/tests/auto/declarative/qquickpositioners/data/horizontal.qml b/tests/auto/qtquick2/qquickpositioners/data/horizontal.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/horizontal.qml rename to tests/auto/qtquick2/qquickpositioners/data/horizontal.qml diff --git a/tests/auto/declarative/qquickpositioners/data/propertychangestest.qml b/tests/auto/qtquick2/qquickpositioners/data/propertychangestest.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/propertychangestest.qml rename to tests/auto/qtquick2/qquickpositioners/data/propertychangestest.qml diff --git a/tests/auto/declarative/qquickpositioners/data/rectangleComponent.qml b/tests/auto/qtquick2/qquickpositioners/data/rectangleComponent.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/rectangleComponent.qml rename to tests/auto/qtquick2/qquickpositioners/data/rectangleComponent.qml diff --git a/tests/auto/declarative/qquickpositioners/data/repeatertest.qml b/tests/auto/qtquick2/qquickpositioners/data/repeatertest.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/repeatertest.qml rename to tests/auto/qtquick2/qquickpositioners/data/repeatertest.qml diff --git a/tests/auto/declarative/qquickpositioners/data/vertical-animated.qml b/tests/auto/qtquick2/qquickpositioners/data/vertical-animated.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/vertical-animated.qml rename to tests/auto/qtquick2/qquickpositioners/data/vertical-animated.qml diff --git a/tests/auto/declarative/qquickpositioners/data/vertical-spacing.qml b/tests/auto/qtquick2/qquickpositioners/data/vertical-spacing.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/vertical-spacing.qml rename to tests/auto/qtquick2/qquickpositioners/data/vertical-spacing.qml diff --git a/tests/auto/declarative/qquickpositioners/data/vertical.qml b/tests/auto/qtquick2/qquickpositioners/data/vertical.qml similarity index 100% rename from tests/auto/declarative/qquickpositioners/data/vertical.qml rename to tests/auto/qtquick2/qquickpositioners/data/vertical.qml diff --git a/tests/auto/declarative/qquickpositioners/qquickpositioners.pro b/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro similarity index 68% rename from tests/auto/declarative/qquickpositioners/qquickpositioners.pro rename to tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro index eee9eca97a..5931b9ba3a 100644 --- a/tests/auto/declarative/qquickpositioners/qquickpositioners.pro +++ b/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro @@ -8,4 +8,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp similarity index 99% rename from tests/auto/declarative/qquickpositioners/tst_qquickpositioners.cpp rename to tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp index ebfd394b0e..867de8cb9e 100644 --- a/tests/auto/declarative/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp @@ -40,14 +40,14 @@ ****************************************************************************/ #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qquickpositioners : public QObject { diff --git a/tests/auto/declarative/qquickrepeater/data/asyncloader.qml b/tests/auto/qtquick2/qquickrepeater/data/asyncloader.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/asyncloader.qml rename to tests/auto/qtquick2/qquickrepeater/data/asyncloader.qml diff --git a/tests/auto/declarative/qquickrepeater/data/initparent.qml b/tests/auto/qtquick2/qquickrepeater/data/initparent.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/initparent.qml rename to tests/auto/qtquick2/qquickrepeater/data/initparent.qml diff --git a/tests/auto/declarative/qquickrepeater/data/intmodel.qml b/tests/auto/qtquick2/qquickrepeater/data/intmodel.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/intmodel.qml rename to tests/auto/qtquick2/qquickrepeater/data/intmodel.qml diff --git a/tests/auto/declarative/qquickrepeater/data/itemlist.qml b/tests/auto/qtquick2/qquickrepeater/data/itemlist.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/itemlist.qml rename to tests/auto/qtquick2/qquickrepeater/data/itemlist.qml diff --git a/tests/auto/declarative/qquickrepeater/data/modelChanged.qml b/tests/auto/qtquick2/qquickrepeater/data/modelChanged.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/modelChanged.qml rename to tests/auto/qtquick2/qquickrepeater/data/modelChanged.qml diff --git a/tests/auto/declarative/qquickrepeater/data/objlist.qml b/tests/auto/qtquick2/qquickrepeater/data/objlist.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/objlist.qml rename to tests/auto/qtquick2/qquickrepeater/data/objlist.qml diff --git a/tests/auto/declarative/qquickrepeater/data/properties.qml b/tests/auto/qtquick2/qquickrepeater/data/properties.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/properties.qml rename to tests/auto/qtquick2/qquickrepeater/data/properties.qml diff --git a/tests/auto/declarative/qquickrepeater/data/repeater1.qml b/tests/auto/qtquick2/qquickrepeater/data/repeater1.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/repeater1.qml rename to tests/auto/qtquick2/qquickrepeater/data/repeater1.qml diff --git a/tests/auto/declarative/qquickrepeater/data/repeater2.qml b/tests/auto/qtquick2/qquickrepeater/data/repeater2.qml similarity index 100% rename from tests/auto/declarative/qquickrepeater/data/repeater2.qml rename to tests/auto/qtquick2/qquickrepeater/data/repeater2.qml diff --git a/tests/auto/declarative/qquickrepeater/qquickrepeater.pro b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro similarity index 73% rename from tests/auto/declarative/qquickrepeater/qquickrepeater.pro rename to tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro index 9cdb9c2c53..7e740f98aa 100644 --- a/tests/auto/declarative/qquickrepeater/qquickrepeater.pro +++ b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro @@ -9,4 +9,4 @@ testFiles.path = . DEPLOYMENT += testFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp similarity index 99% rename from tests/auto/declarative/qquickrepeater/tst_qquickrepeater.cpp rename to tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp index 6024d1307a..1d6af452e4 100644 --- a/tests/auto/declarative/qquickrepeater/tst_qquickrepeater.cpp +++ b/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp @@ -43,15 +43,14 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include -#include "../shared/util.h" -#include "../../../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qquickshadereffect/qquickshadereffect.pro b/tests/auto/qtquick2/qquickshadereffect/qquickshadereffect.pro similarity index 63% rename from tests/auto/declarative/qquickshadereffect/qquickshadereffect.pro rename to tests/auto/qtquick2/qquickshadereffect/qquickshadereffect.pro index 540bbe1515..de8b247340 100644 --- a/tests/auto/declarative/qquickshadereffect/qquickshadereffect.pro +++ b/tests/auto/qtquick2/qquickshadereffect/qquickshadereffect.pro @@ -5,4 +5,4 @@ SOURCES += tst_qquickshadereffect.cpp macx:CONFIG -= app_bundle CONFIG += parallel_test -QT += core-private gui-private declarative-private widgets testlib +QT += core-private gui-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qquickshadereffect/tst_qquickshadereffect.cpp b/tests/auto/qtquick2/qquickshadereffect/tst_qquickshadereffect.cpp similarity index 100% rename from tests/auto/declarative/qquickshadereffect/tst_qquickshadereffect.cpp rename to tests/auto/qtquick2/qquickshadereffect/tst_qquickshadereffect.cpp diff --git a/tests/auto/declarative/qquickspriteimage/data/basic.qml b/tests/auto/qtquick2/qquickspriteimage/data/basic.qml similarity index 100% rename from tests/auto/declarative/qquickspriteimage/data/basic.qml rename to tests/auto/qtquick2/qquickspriteimage/data/basic.qml diff --git a/tests/auto/declarative/qquickspriteimage/data/squarefacesprite.png b/tests/auto/qtquick2/qquickspriteimage/data/squarefacesprite.png similarity index 100% rename from tests/auto/declarative/qquickspriteimage/data/squarefacesprite.png rename to tests/auto/qtquick2/qquickspriteimage/data/squarefacesprite.png diff --git a/tests/auto/declarative/qquickspriteimage/qquickspriteimage.pro b/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro similarity index 72% rename from tests/auto/declarative/qquickspriteimage/qquickspriteimage.pro rename to tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro index db5c45da8a..fe788f5b7b 100644 --- a/tests/auto/declarative/qquickspriteimage/qquickspriteimage.pro +++ b/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickspriteimage/tst_qquickspriteimage.cpp b/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp similarity index 97% rename from tests/auto/declarative/qquickspriteimage/tst_qquickspriteimage.cpp rename to tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp index 1b8c58b873..5c09019b03 100644 --- a/tests/auto/declarative/qquickspriteimage/tst_qquickspriteimage.cpp +++ b/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include "../shared/util.h" -#include +#include "../../shared/util.h" +#include #include class tst_qquickspriteimage : public QObject diff --git a/tests/auto/declarative/qquicktext/data/alignments.qml b/tests/auto/qtquick2/qquicktext/data/alignments.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments.qml rename to tests/auto/qtquick2/qquicktext/data/alignments.qml diff --git a/tests/auto/declarative/qquicktext/data/alignments_cb.png b/tests/auto/qtquick2/qquicktext/data/alignments_cb.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_cb.png rename to tests/auto/qtquick2/qquicktext/data/alignments_cb.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_cc.png b/tests/auto/qtquick2/qquicktext/data/alignments_cc.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_cc.png rename to tests/auto/qtquick2/qquicktext/data/alignments_cc.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_ct.png b/tests/auto/qtquick2/qquicktext/data/alignments_ct.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_ct.png rename to tests/auto/qtquick2/qquicktext/data/alignments_ct.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_lb.png b/tests/auto/qtquick2/qquicktext/data/alignments_lb.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_lb.png rename to tests/auto/qtquick2/qquicktext/data/alignments_lb.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_lc.png b/tests/auto/qtquick2/qquicktext/data/alignments_lc.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_lc.png rename to tests/auto/qtquick2/qquicktext/data/alignments_lc.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_lt.png b/tests/auto/qtquick2/qquicktext/data/alignments_lt.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_lt.png rename to tests/auto/qtquick2/qquicktext/data/alignments_lt.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_rb.png b/tests/auto/qtquick2/qquicktext/data/alignments_rb.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_rb.png rename to tests/auto/qtquick2/qquicktext/data/alignments_rb.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_rc.png b/tests/auto/qtquick2/qquicktext/data/alignments_rc.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_rc.png rename to tests/auto/qtquick2/qquicktext/data/alignments_rc.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_rt.png b/tests/auto/qtquick2/qquicktext/data/alignments_rt.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/alignments_rt.png rename to tests/auto/qtquick2/qquicktext/data/alignments_rt.png diff --git a/tests/auto/declarative/qquicktext/data/embeddedImagesLocal.qml b/tests/auto/qtquick2/qquicktext/data/embeddedImagesLocal.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/embeddedImagesLocal.qml rename to tests/auto/qtquick2/qquicktext/data/embeddedImagesLocal.qml diff --git a/tests/auto/declarative/qquicktext/data/embeddedImagesLocalError.qml b/tests/auto/qtquick2/qquicktext/data/embeddedImagesLocalError.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/embeddedImagesLocalError.qml rename to tests/auto/qtquick2/qquicktext/data/embeddedImagesLocalError.qml diff --git a/tests/auto/declarative/qquicktext/data/embeddedImagesRemote.qml b/tests/auto/qtquick2/qquicktext/data/embeddedImagesRemote.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/embeddedImagesRemote.qml rename to tests/auto/qtquick2/qquicktext/data/embeddedImagesRemote.qml diff --git a/tests/auto/declarative/qquicktext/data/embeddedImagesRemoteError.qml b/tests/auto/qtquick2/qquicktext/data/embeddedImagesRemoteError.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/embeddedImagesRemoteError.qml rename to tests/auto/qtquick2/qquicktext/data/embeddedImagesRemoteError.qml diff --git a/tests/auto/declarative/qquicktext/data/horizontalAlignment_RightToLeft.qml b/tests/auto/qtquick2/qquicktext/data/horizontalAlignment_RightToLeft.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/horizontalAlignment_RightToLeft.qml rename to tests/auto/qtquick2/qquicktext/data/horizontalAlignment_RightToLeft.qml diff --git a/tests/auto/declarative/qquicktext/data/http/exists.png b/tests/auto/qtquick2/qquicktext/data/http/exists.png similarity index 100% rename from tests/auto/declarative/qquicktext/data/http/exists.png rename to tests/auto/qtquick2/qquicktext/data/http/exists.png diff --git a/tests/auto/declarative/qquicktext/data/lineCount.qml b/tests/auto/qtquick2/qquicktext/data/lineCount.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/lineCount.qml rename to tests/auto/qtquick2/qquicktext/data/lineCount.qml diff --git a/tests/auto/declarative/qquicktext/data/lineHeight.qml b/tests/auto/qtquick2/qquicktext/data/lineHeight.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/lineHeight.qml rename to tests/auto/qtquick2/qquicktext/data/lineHeight.qml diff --git a/tests/auto/declarative/qquicktext/data/lineLayout.qml b/tests/auto/qtquick2/qquicktext/data/lineLayout.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/lineLayout.qml rename to tests/auto/qtquick2/qquicktext/data/lineLayout.qml diff --git a/tests/auto/declarative/qquicktext/data/multilineelide.qml b/tests/auto/qtquick2/qquicktext/data/multilineelide.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/multilineelide.qml rename to tests/auto/qtquick2/qquicktext/data/multilineelide.qml diff --git a/tests/auto/declarative/qquicktext/data/qtbug_14734.qml b/tests/auto/qtquick2/qquicktext/data/qtbug_14734.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/qtbug_14734.qml rename to tests/auto/qtquick2/qquicktext/data/qtbug_14734.qml diff --git a/tests/auto/declarative/qquicktext/data/rotated.qml b/tests/auto/qtquick2/qquicktext/data/rotated.qml similarity index 100% rename from tests/auto/declarative/qquicktext/data/rotated.qml rename to tests/auto/qtquick2/qquicktext/data/rotated.qml diff --git a/tests/auto/qtquick2/qquicktext/qquicktext.pro b/tests/auto/qtquick2/qquicktext/qquicktext.pro new file mode 100644 index 0000000000..e5bd50afc6 --- /dev/null +++ b/tests/auto/qtquick2/qquicktext/qquicktext.pro @@ -0,0 +1,17 @@ +CONFIG += testcase +TARGET = tst_qquicktext +macx:CONFIG -= app_bundle + +SOURCES += tst_qquicktext.cpp + +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private v8-private declarative-private quick-private widgets-private opengl-private network testlib diff --git a/tests/auto/declarative/qquicktext/tst_qquicktext.cpp b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp similarity index 99% rename from tests/auto/declarative/qquicktext/tst_qquicktext.cpp rename to tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp index fb37357608..60e8571a47 100644 --- a/tests/auto/declarative/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp @@ -42,17 +42,17 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include "testhttpserver.h" DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) diff --git a/tests/auto/declarative/qquicktextedit/data/CursorRect.qml b/tests/auto/qtquick2/qquicktextedit/data/CursorRect.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/CursorRect.qml rename to tests/auto/qtquick2/qquicktextedit/data/CursorRect.qml diff --git a/tests/auto/declarative/qquicktextedit/data/alignments.qml b/tests/auto/qtquick2/qquicktextedit/data/alignments.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments.qml rename to tests/auto/qtquick2/qquicktextedit/data/alignments.qml diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_cb.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_cb.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_cb.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_cb.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_cc.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_cc.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_cc.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_cc.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_ct.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_ct.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_ct.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_ct.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_lb.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_lb.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_lb.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_lb.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_lc.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_lc.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_lc.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_lc.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_lt.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_lt.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_lt.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_lt.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_rb.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_rb.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_rb.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_rb.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_rc.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_rc.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_rc.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_rc.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_rt.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_rt.png similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/alignments_rt.png rename to tests/auto/qtquick2/qquicktextedit/data/alignments_rt.png diff --git a/tests/auto/declarative/qquicktextedit/data/cursorTest.qml b/tests/auto/qtquick2/qquicktextedit/data/cursorTest.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/cursorTest.qml rename to tests/auto/qtquick2/qquicktextedit/data/cursorTest.qml diff --git a/tests/auto/declarative/qquicktextedit/data/cursorVisible.qml b/tests/auto/qtquick2/qquicktextedit/data/cursorVisible.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/cursorVisible.qml rename to tests/auto/qtquick2/qquicktextedit/data/cursorVisible.qml diff --git a/tests/auto/declarative/qquicktextedit/data/geometrySignals.qml b/tests/auto/qtquick2/qquicktextedit/data/geometrySignals.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/geometrySignals.qml rename to tests/auto/qtquick2/qquicktextedit/data/geometrySignals.qml diff --git a/tests/auto/declarative/qquicktextedit/data/horizontalAlignment_RightToLeft.qml b/tests/auto/qtquick2/qquicktextedit/data/horizontalAlignment_RightToLeft.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/horizontalAlignment_RightToLeft.qml rename to tests/auto/qtquick2/qquicktextedit/data/horizontalAlignment_RightToLeft.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/ErrItem.qml b/tests/auto/qtquick2/qquicktextedit/data/http/ErrItem.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/http/ErrItem.qml rename to tests/auto/qtquick2/qquicktextedit/data/http/ErrItem.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/NormItem.qml b/tests/auto/qtquick2/qquicktextedit/data/http/NormItem.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/http/NormItem.qml rename to tests/auto/qtquick2/qquicktextedit/data/http/NormItem.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTest.qml b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTest.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTest.qml rename to tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTest.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail1.qml b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail1.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail1.qml rename to tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail1.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail2.qml b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail2.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail2.qml rename to tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail2.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestPass.qml b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestPass.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestPass.qml rename to tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestPass.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/qmldir b/tests/auto/qtquick2/qquicktextedit/data/http/qmldir similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/http/qmldir rename to tests/auto/qtquick2/qquicktextedit/data/http/qmldir diff --git a/tests/auto/declarative/qquicktextedit/data/httpfail/FailItem.qml b/tests/auto/qtquick2/qquicktextedit/data/httpfail/FailItem.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/httpfail/FailItem.qml rename to tests/auto/qtquick2/qquicktextedit/data/httpfail/FailItem.qml diff --git a/tests/auto/declarative/qquicktextedit/data/httpslow/WaitItem.qml b/tests/auto/qtquick2/qquicktextedit/data/httpslow/WaitItem.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/httpslow/WaitItem.qml rename to tests/auto/qtquick2/qquicktextedit/data/httpslow/WaitItem.qml diff --git a/tests/auto/declarative/qquicktextedit/data/inputContext.qml b/tests/auto/qtquick2/qquicktextedit/data/inputContext.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/inputContext.qml rename to tests/auto/qtquick2/qquicktextedit/data/inputContext.qml diff --git a/tests/auto/declarative/qquicktextedit/data/inputMethodEvent.qml b/tests/auto/qtquick2/qquicktextedit/data/inputMethodEvent.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/inputMethodEvent.qml rename to tests/auto/qtquick2/qquicktextedit/data/inputMethodEvent.qml diff --git a/tests/auto/declarative/qquicktextedit/data/inputmethodhints.qml b/tests/auto/qtquick2/qquicktextedit/data/inputmethodhints.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/inputmethodhints.qml rename to tests/auto/qtquick2/qquicktextedit/data/inputmethodhints.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_default.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_default.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/mouseselection_default.qml rename to tests/auto/qtquick2/qquicktextedit/data/mouseselection_default.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_false.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_false.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/mouseselection_false.qml rename to tests/auto/qtquick2/qquicktextedit/data/mouseselection_false.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_false_words.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_false_words.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/mouseselection_false_words.qml rename to tests/auto/qtquick2/qquicktextedit/data/mouseselection_false_words.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_true.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_true.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/mouseselection_true.qml rename to tests/auto/qtquick2/qquicktextedit/data/mouseselection_true.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_true_words.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_true_words.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/mouseselection_true_words.qml rename to tests/auto/qtquick2/qquicktextedit/data/mouseselection_true_words.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_characters.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_characters.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_characters.qml rename to tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_characters.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_default.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_default.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_default.qml rename to tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_default.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_words.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_words.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_words.qml rename to tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_words.qml diff --git a/tests/auto/declarative/qquicktextedit/data/navigation.qml b/tests/auto/qtquick2/qquicktextedit/data/navigation.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/navigation.qml rename to tests/auto/qtquick2/qquicktextedit/data/navigation.qml diff --git a/tests/auto/declarative/qquicktextedit/data/openInputPanel.qml b/tests/auto/qtquick2/qquicktextedit/data/openInputPanel.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/openInputPanel.qml rename to tests/auto/qtquick2/qquicktextedit/data/openInputPanel.qml diff --git a/tests/auto/declarative/qquicktextedit/data/positionAt.qml b/tests/auto/qtquick2/qquicktextedit/data/positionAt.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/positionAt.qml rename to tests/auto/qtquick2/qquicktextedit/data/positionAt.qml diff --git a/tests/auto/declarative/qquicktextedit/data/qtbug-22058.qml b/tests/auto/qtquick2/qquicktextedit/data/qtbug-22058.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/qtbug-22058.qml rename to tests/auto/qtquick2/qquicktextedit/data/qtbug-22058.qml diff --git a/tests/auto/declarative/qquicktextedit/data/readOnly.qml b/tests/auto/qtquick2/qquicktextedit/data/readOnly.qml similarity index 100% rename from tests/auto/declarative/qquicktextedit/data/readOnly.qml rename to tests/auto/qtquick2/qquicktextedit/data/readOnly.qml diff --git a/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro b/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro new file mode 100644 index 0000000000..02a834beab --- /dev/null +++ b/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro @@ -0,0 +1,12 @@ +CONFIG += testcase +TARGET = tst_qquicktextedit +macx:CONFIG -= app_bundle + +SOURCES += tst_qquicktextedit.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private quick-private opengl-private network widgets-private testlib diff --git a/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp similarity index 99% rename from tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp rename to tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp index 6bcad83c52..97d7531321 100644 --- a/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include #include -#include "../shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #include #include #include @@ -52,14 +52,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include #include diff --git a/tests/auto/declarative/qquicktextinput/data/cursorTest.qml b/tests/auto/qtquick2/qquicktextinput/data/cursorTest.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/cursorTest.qml rename to tests/auto/qtquick2/qquicktextinput/data/cursorTest.qml diff --git a/tests/auto/declarative/qquicktextinput/data/cursorVisible.qml b/tests/auto/qtquick2/qquicktextinput/data/cursorVisible.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/cursorVisible.qml rename to tests/auto/qtquick2/qquicktextinput/data/cursorVisible.qml diff --git a/tests/auto/declarative/qquicktextinput/data/echoMode.qml b/tests/auto/qtquick2/qquicktextinput/data/echoMode.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/echoMode.qml rename to tests/auto/qtquick2/qquicktextinput/data/echoMode.qml diff --git a/tests/auto/declarative/qquicktextinput/data/geometrySignals.qml b/tests/auto/qtquick2/qquicktextinput/data/geometrySignals.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/geometrySignals.qml rename to tests/auto/qtquick2/qquicktextinput/data/geometrySignals.qml diff --git a/tests/auto/declarative/qquicktextinput/data/halign_center.png b/tests/auto/qtquick2/qquicktextinput/data/halign_center.png similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/halign_center.png rename to tests/auto/qtquick2/qquicktextinput/data/halign_center.png diff --git a/tests/auto/declarative/qquicktextinput/data/halign_left.png b/tests/auto/qtquick2/qquicktextinput/data/halign_left.png similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/halign_left.png rename to tests/auto/qtquick2/qquicktextinput/data/halign_left.png diff --git a/tests/auto/declarative/qquicktextinput/data/halign_right.png b/tests/auto/qtquick2/qquicktextinput/data/halign_right.png similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/halign_right.png rename to tests/auto/qtquick2/qquicktextinput/data/halign_right.png diff --git a/tests/auto/declarative/qquicktextinput/data/horizontalAlignment.qml b/tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/horizontalAlignment.qml rename to tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment.qml diff --git a/tests/auto/declarative/qquicktextinput/data/horizontalAlignment_RightToLeft.qml b/tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment_RightToLeft.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/horizontalAlignment_RightToLeft.qml rename to tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment_RightToLeft.qml diff --git a/tests/auto/declarative/qquicktextinput/data/inputContext.qml b/tests/auto/qtquick2/qquicktextinput/data/inputContext.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/inputContext.qml rename to tests/auto/qtquick2/qquicktextinput/data/inputContext.qml diff --git a/tests/auto/declarative/qquicktextinput/data/inputMethodEvent.qml b/tests/auto/qtquick2/qquicktextinput/data/inputMethodEvent.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/inputMethodEvent.qml rename to tests/auto/qtquick2/qquicktextinput/data/inputMethodEvent.qml diff --git a/tests/auto/declarative/qquicktextinput/data/inputmethods.qml b/tests/auto/qtquick2/qquicktextinput/data/inputmethods.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/inputmethods.qml rename to tests/auto/qtquick2/qquicktextinput/data/inputmethods.qml diff --git a/tests/auto/declarative/qquicktextinput/data/masks.qml b/tests/auto/qtquick2/qquicktextinput/data/masks.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/masks.qml rename to tests/auto/qtquick2/qquicktextinput/data/masks.qml diff --git a/tests/auto/declarative/qquicktextinput/data/maxLength.qml b/tests/auto/qtquick2/qquicktextinput/data/maxLength.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/maxLength.qml rename to tests/auto/qtquick2/qquicktextinput/data/maxLength.qml diff --git a/tests/auto/declarative/qquicktextinput/data/mouseselection_true.qml b/tests/auto/qtquick2/qquicktextinput/data/mouseselection_true.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/mouseselection_true.qml rename to tests/auto/qtquick2/qquicktextinput/data/mouseselection_true.qml diff --git a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_characters.qml b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_characters.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_characters.qml rename to tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_characters.qml diff --git a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_default.qml b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_default.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_default.qml rename to tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_default.qml diff --git a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_words.qml b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_words.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_words.qml rename to tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_words.qml diff --git a/tests/auto/declarative/qquicktextinput/data/navigation.qml b/tests/auto/qtquick2/qquicktextinput/data/navigation.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/navigation.qml rename to tests/auto/qtquick2/qquicktextinput/data/navigation.qml diff --git a/tests/auto/declarative/qquicktextinput/data/openInputPanel.qml b/tests/auto/qtquick2/qquicktextinput/data/openInputPanel.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/openInputPanel.qml rename to tests/auto/qtquick2/qquicktextinput/data/openInputPanel.qml diff --git a/tests/auto/declarative/qquicktextinput/data/positionAt.qml b/tests/auto/qtquick2/qquicktextinput/data/positionAt.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/positionAt.qml rename to tests/auto/qtquick2/qquicktextinput/data/positionAt.qml diff --git a/tests/auto/declarative/qquicktextinput/data/preeditAutoScroll.qml b/tests/auto/qtquick2/qquicktextinput/data/preeditAutoScroll.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/preeditAutoScroll.qml rename to tests/auto/qtquick2/qquicktextinput/data/preeditAutoScroll.qml diff --git a/tests/auto/declarative/qquicktextinput/data/qtbug-19956double.qml b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956double.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/qtbug-19956double.qml rename to tests/auto/qtquick2/qquicktextinput/data/qtbug-19956double.qml diff --git a/tests/auto/declarative/qquicktextinput/data/qtbug-19956int.qml b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956int.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/qtbug-19956int.qml rename to tests/auto/qtquick2/qquicktextinput/data/qtbug-19956int.qml diff --git a/tests/auto/declarative/qquicktextinput/data/qtbug-19956regexp.qml b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956regexp.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/qtbug-19956regexp.qml rename to tests/auto/qtquick2/qquicktextinput/data/qtbug-19956regexp.qml diff --git a/tests/auto/declarative/qquicktextinput/data/readOnly.qml b/tests/auto/qtquick2/qquicktextinput/data/readOnly.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/readOnly.qml rename to tests/auto/qtquick2/qquicktextinput/data/readOnly.qml diff --git a/tests/auto/declarative/qquicktextinput/data/validators.qml b/tests/auto/qtquick2/qquicktextinput/data/validators.qml similarity index 100% rename from tests/auto/declarative/qquicktextinput/data/validators.qml rename to tests/auto/qtquick2/qquicktextinput/data/validators.qml diff --git a/tests/auto/declarative/qquicktextinput/qquicktextinput.pro b/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro similarity index 65% rename from tests/auto/declarative/qquicktextinput/qquicktextinput.pro rename to tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro index 9c74559cb2..f81da61634 100644 --- a/tests/auto/declarative/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro @@ -8,4 +8,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp similarity index 99% rename from tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp rename to tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp index a6a9add5d5..57b2df11c9 100644 --- a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include #include -#include "../shared/util.h" +#include "../../shared/util.h" #include #include #include -#include +#include #include #include #include diff --git a/tests/auto/declarative/qquickview/data/error1.qml b/tests/auto/qtquick2/qquickview/data/error1.qml similarity index 100% rename from tests/auto/declarative/qquickview/data/error1.qml rename to tests/auto/qtquick2/qquickview/data/error1.qml diff --git a/tests/auto/declarative/qquickview/data/resizemodeitem.qml b/tests/auto/qtquick2/qquickview/data/resizemodeitem.qml similarity index 100% rename from tests/auto/declarative/qquickview/data/resizemodeitem.qml rename to tests/auto/qtquick2/qquickview/data/resizemodeitem.qml diff --git a/tests/auto/declarative/qquickview/qquickview.pro b/tests/auto/qtquick2/qquickview/qquickview.pro similarity index 71% rename from tests/auto/declarative/qquickview/qquickview.pro rename to tests/auto/qtquick2/qquickview/qquickview.pro index c5cc3ce6a7..d4e7c064fa 100644 --- a/tests/auto/declarative/qquickview/qquickview.pro +++ b/tests/auto/qtquick2/qquickview/qquickview.pro @@ -8,4 +8,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickview/tst_qquickview.cpp b/tests/auto/qtquick2/qquickview/tst_qquickview.cpp similarity index 98% rename from tests/auto/declarative/qquickview/tst_qquickview.cpp rename to tests/auto/qtquick2/qquickview/tst_qquickview.cpp index fc480b5fca..953374dcab 100644 --- a/tests/auto/declarative/qquickview/tst_qquickview.cpp +++ b/tests/auto/qtquick2/qquickview/tst_qquickview.cpp @@ -42,9 +42,9 @@ #include #include #include -#include -#include -#include "../shared/util.h" +#include +#include +#include "../../shared/util.h" #include #include diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/create.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/create.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/create.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/create.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/datalist-package.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/datalist-package.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/datalist-package.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/datalist-package.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/datalist.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/datalist.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/datalist.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/datalist.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/groups-invalid.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups-invalid.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/groups-invalid.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/groups-invalid.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/groups-package.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups-package.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/groups-package.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/groups-package.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/groups.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/groups.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/groups.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_listView.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_listView.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_listView.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_listView.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_package.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_package.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_package.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_package.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/modelproperties.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/modelproperties.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/modelproperties2.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties2.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/modelproperties2.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties2.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/objectlist.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/objectlist.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/objectlist.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/objectlist.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/onChanged.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/onChanged.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/onChanged.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/onChanged.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/singlerole1.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole1.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/singlerole1.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole1.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/singlerole2.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole2.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/singlerole2.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole2.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/visualdatamodel.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/visualdatamodel.qml similarity index 100% rename from tests/auto/declarative/qquickvisualdatamodel/data/visualdatamodel.qml rename to tests/auto/qtquick2/qquickvisualdatamodel/data/visualdatamodel.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro similarity index 71% rename from tests/auto/declarative/qquickvisualdatamodel/qquickvisualdatamodel.pro rename to tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro index 35e627c1ad..8e87e10a97 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/qquickvisualdatamodel.pro +++ b/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private widgets testlib +QT += core-private gui-private v8-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp similarity index 99% rename from tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp rename to tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index 0278b0cf2c..f0e6228d29 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../shared/util.h" +#include "../../shared/util.h" #include #include #include @@ -46,10 +46,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/qtquick2/qtquick2.pro b/tests/auto/qtquick2/qtquick2.pro new file mode 100644 index 0000000000..af468a6393 --- /dev/null +++ b/tests/auto/qtquick2/qtquick2.pro @@ -0,0 +1,63 @@ +TEMPLATE = subdirs + +PUBLICTESTS += \ + examples \ + geometry \ + nodes \ + qdeclarativepixmapcache + +PRIVATETESTS += \ + qdeclarativeanimations \ + qdeclarativeapplication \ + qdeclarativebehaviors \ + qdeclarativefontloader \ + qdeclarativepath \ + qdeclarativesmoothedanimation \ + qdeclarativespringanimation \ + qdeclarativestyledtext \ + qdeclarativestates \ + qdeclarativesystempalette \ + qdeclarativetimer \ + qdeclarativexmllistmodel + +# This test requires the xmlpatterns module +!contains(QT_CONFIG,xmlpatterns):PRIVATETESTS -= qdeclarativexmllistmodel + +QUICKTESTS = \ + qquickanchors \ + qquickanimatedimage \ + qquickborderimage \ + qquickcanvas \ + qquickdrag \ + qquickdroparea \ + qquickflickable \ + qquickflipable \ + qquickfocusscope \ + qquickgridview \ + qquickimage \ + qquickitem \ + qquickitem2 \ + qquicklistview \ + qquickloader \ + qquickmousearea \ + qquickmultipointtoucharea \ + qquickpathview \ + qquickpincharea \ + qquickpositioners \ + qquickrepeater \ + qquickshadereffect \ + qquickspriteimage \ + qquicktext \ + qquicktextedit \ + qquicktextinput \ + qquickvisualdatamodel \ + qquickview \ + qquickcanvasitem \ + + +SUBDIRS += $$PUBLICTESTS + +contains(QT_CONFIG, private_tests) { + SUBDIRS += $$PRIVATETESTS + SUBDIRS += $$QUICKTESTS +} diff --git a/tests/auto/declarative/shared/testhttpserver.cpp b/tests/auto/shared/testhttpserver.cpp similarity index 100% rename from tests/auto/declarative/shared/testhttpserver.cpp rename to tests/auto/shared/testhttpserver.cpp diff --git a/tests/auto/declarative/shared/testhttpserver.h b/tests/auto/shared/testhttpserver.h similarity index 100% rename from tests/auto/declarative/shared/testhttpserver.h rename to tests/auto/shared/testhttpserver.h diff --git a/tests/auto/declarative/shared/util.h b/tests/auto/shared/util.h similarity index 100% rename from tests/auto/declarative/shared/util.h rename to tests/auto/shared/util.h diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro index 4d1926da22..17b23255ac 100644 --- a/tests/benchmarks/particles/affectors/affectors.pro +++ b/tests/benchmarks/particles/affectors/affectors.pro @@ -7,4 +7,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro index 6e5e8ec019..343bdf0430 100644 --- a/tests/benchmarks/particles/emission/emission.pro +++ b/tests/benchmarks/particles/emission/emission.pro @@ -7,4 +7,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tools/qmleasing/main.cpp b/tools/qmleasing/main.cpp index a9f1da41d4..224e23f544 100644 --- a/tools/qmleasing/main.cpp +++ b/tools/qmleasing/main.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include -#include +#include #include #include -#include +#include class EasingPlot : public QQuickPaintedItem { diff --git a/tools/qmleasing/qmleasing.pro b/tools/qmleasing/qmleasing.pro index 4a64fe91e0..eb2ee86070 100644 --- a/tools/qmleasing/qmleasing.pro +++ b/tools/qmleasing/qmleasing.pro @@ -3,7 +3,7 @@ TARGET = DEPENDPATH += . INCLUDEPATH += . -QT += declarative widgets +QT += declarative quick widgets CONFIG -= app_bundle # Input diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 5e35abcc8b..c9f6cbe6c1 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -39,15 +39,19 @@ ** ****************************************************************************/ -#include +#include #include #include -#include -#include +#include +#include #include +#include +#include #include +#include +#include #include #include #include @@ -674,11 +678,11 @@ int main(int argc, char *argv[]) engine.addImportPath(pluginImportPath); } - // load the QtQuick 1 plugin + // load the QtQuick 1 & 2 plugins { - QByteArray code("import QtQuick 1.0\nQtObject {}"); + QByteArray code("import QtQuick 1.0 as Q1\nimport QtQuick 2.0 as Q2\nQ2.QtObject {}"); QDeclarativeComponent c(&engine); - c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/loadqtquick1.qml")); + c.setData(code, QUrl::fromLocalFile(pluginImportPath + "/loadqtquick.qml")); c.create(); if (!c.errors().isEmpty()) { foreach (const QDeclarativeError &error, c.errors()) diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 7db7722c62..a327bb68d9 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -2,7 +2,7 @@ TEMPLATE = app CONFIG += qt uic console DESTDIR = $$QT.declarative.bins -QT += declarative declarative-private qtquick1 core-private widgets +QT += declarative declarative-private quick-private qtquick1 core-private widgets TARGET = qmlplugindump diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 336fc899cd..696686afef 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -58,8 +58,8 @@ #include // ### This should be private API -#include -#include +#include +#include #define QT_NO_SCENEGRAPHITEM diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index d0c4ec7a20..4147c68005 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = qmlscene DESTDIR= $$QT.declarative.bins -QT += declarative declarative-private qtquick1 widgets +QT += declarative declarative-private quick qtquick1 widgets target.path = $$[QT_INSTALL_BINS] INSTALLS += target