diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-23 15:14:07 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-02 14:18:20 +0100 |
| commit | 6c8378eaf1edbbefe6aaa3672b0127816a004fd7 (patch) | |
| tree | 8ee08fb447e052f7a7a685fbeaaa04f04ea60126 /src/imports/testlib | |
| parent | e01219b77b1e889e70437635905d7ff820568e23 (diff) | |
Say hello to QtQuick module
This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.
99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.
The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.
All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.
A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.
The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)
There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.
In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.
Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'src/imports/testlib')
| -rw-r--r-- | src/imports/testlib/main.cpp | 2 | ||||
| -rw-r--r-- | src/imports/testlib/testlib.pro | 2 |
2 files changed, 2 insertions, 2 deletions
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 <QtDeclarative/private/qdeclarativeengine_p.h> 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 += |