diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qmlplugindump/main.cpp | 8 | ||||
-rw-r--r-- | tools/qmlscene/main.cpp | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index d0ab0d8784..b4cf2da3ff 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -42,8 +42,8 @@ #include <QtDeclarative/QtDeclarative> #include <QtDeclarative/private/qdeclarativemetatype_p.h> #include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h> -#include <QtDeclarative/private/qsgevents_p_p.h> -#include <QtDeclarative/private/qsgpincharea_p.h> +#include <QtDeclarative/private/qquickevents_p_p.h> +#include <QtDeclarative/private/qquickpincharea_p.h> #include <QtWidgets/QApplication> @@ -586,8 +586,8 @@ int main(int argc, char *argv[]) QList<QDeclarativeType *> defaultTypes = QDeclarativeMetaType::qmlTypes(); // add some otherwise unreachable QMetaObjects - defaultReachable.insert(&QSGMouseEvent::staticMetaObject); - // QSGKeyEvent, QSGPinchEvent, QSGDropEvent are not exported + defaultReachable.insert(&QQuickMouseEvent::staticMetaObject); + // QQuickKeyEvent, QQuickPinchEvent, QQuickDropEvent are not exported // this will hold the meta objects we want to dump information of QSet<const QMetaObject *> metas; diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index c5f9274571..4706c72eb6 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -58,8 +58,8 @@ #include <QtDeclarative/qdeclarativecontext.h> // ### This should be private API -#include <qsgitem.h> -#include <qsgview.h> +#include <qquickitem.h> +#include <qquickview.h> #define QT_NO_SCENEGRAPHITEM @@ -143,12 +143,12 @@ void RenderStatistics::printTotalStats() } #endif -class MyQSGView : public QSGView +class MyQQuickView : public QQuickView { public: - MyQSGView() : QSGView() + MyQQuickView() : QQuickView() { - setResizeMode(QSGView::SizeRootObjectToView); + setResizeMode(QQuickView::SizeRootObjectToView); } }; @@ -491,7 +491,7 @@ int main(int argc, char ** argv) #endif if (options.versionDetection) checkAndAdaptVersion(options.file); - QSGView *qxView = new MyQSGView(); + QQuickView *qxView = new MyQQuickView(); qxView->setVSyncAnimations(options.vsync); engine = qxView->engine(); for (int i = 0; i < imports.size(); ++i) |