diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-14 10:51:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 11:53:26 +0200 |
| commit | bfb3c424abc7c839dc44de0e36024ede99ece736 (patch) | |
| tree | b6814d0238bead8518b23c078beb818432de6ce4 /src/qmltest/quicktest.cpp | |
| parent | 2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (diff) | |
Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.
All the classes and files in the declarative/items
directory have been renamed.
In particular, for classes that are currently public,
the renaming is as follows:
QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem
The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).
Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/qmltest/quicktest.cpp')
| -rw-r--r-- | src/qmltest/quicktest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 150304028d..3c726d43d1 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -49,7 +49,7 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecontext.h> #if defined(QML_VERSION) && QML_VERSION >= 0x020000 -#include <QtDeclarative/qsgview.h> +#include <QtDeclarative/qquickview.h> #define QUICK_TEST_SCENEGRAPH 1 #endif #include <QtDeclarative/qjsvalue.h> @@ -175,7 +175,7 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport // in turn with a QDeclarativeView. #ifdef QUICK_TEST_SCENEGRAPH if (qtQuick2) { - QSGView view; + QQuickView view; QTestRootObject rootobj; QEventLoop eventLoop; QObject::connect(view.engine(), SIGNAL(quit()), @@ -199,7 +199,7 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport view.setSource(QUrl::fromLocalFile(path)); if (QTest::printAvailableFunctions) continue; - if (view.status() == QSGView::Error) { + if (view.status() == QQuickView::Error) { // Error compiling the test - flag failure in the log and continue. QList<QDeclarativeError> errors = view.errors(); QuickTestResult results; |