aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/examples/tst_examples.cpp
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-10-14 10:51:42 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-21 11:53:26 +0200
commitbfb3c424abc7c839dc44de0e36024ede99ece736 (patch)
treeb6814d0238bead8518b23c078beb818432de6ce4 /tests/auto/declarative/examples/tst_examples.cpp
parent2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (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 'tests/auto/declarative/examples/tst_examples.cpp')
-rw-r--r--tests/auto/declarative/examples/tst_examples.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 58f16a49d6..c14d41ac48 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -44,7 +44,7 @@
#include <QDir>
#include <QProcess>
#include <QDebug>
-#include <QSGView>
+#include <QQuickView>
#include <QDeclarativeError>
class tst_examples : public QObject
@@ -72,7 +72,7 @@ tst_examples::tst_examples()
excludedDirs << "examples/declarative/text/fonts"; // QTBUG-21415
#endif
- // Not run in QSGView
+ // Not run in QQuickView
excludedDirs << "examples/declarative/qtquick1";
// These snippets are not expected to run on their own.
@@ -207,16 +207,16 @@ void tst_examples::sgexamples()
{
QFETCH(QString, file);
- QSGView view;
+ QQuickView view;
QtMsgHandler old = qInstallMsgHandler(silentErrorsMsgHandler);
view.setSource(file);
qInstallMsgHandler(old);
- if (view.status() == QSGView::Error)
+ if (view.status() == QQuickView::Error)
qWarning() << view.errors();
- QCOMPARE(view.status(), QSGView::Ready);
+ QCOMPARE(view.status(), QQuickView::Ready);
view.show();
QTest::qWait(100);