diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
commit | 82621148de82d63a562163a72598e15ed98797a8 (patch) | |
tree | 030d345ad4a4ae612995949bbbeec66b36e69854 /examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp | |
parent | 2fc515ea1eaa0f7ffb56c4dadee560095c3374bd (diff) | |
parent | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
Diffstat (limited to 'examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp')
-rw-r--r-- | examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp index 33cead8e0..27102b0c5 100644 --- a/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -90,7 +90,7 @@ QmlApplicationViewer::QmlApplicationViewer(QWindow *parent) : QQuickView(parent) , d(new QmlApplicationViewerPrivate(this)) { - connect(engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit())); + connect(engine(), &QQmlEngine::quit, QCoreApplication::instance(), &QCoreApplication::quit); setResizeMode(QQuickView::SizeRootObjectToView); } @@ -98,7 +98,7 @@ QmlApplicationViewer::QmlApplicationViewer(QQuickView *view, QWindow *parent) : QQuickView(parent) , d(new QmlApplicationViewerPrivate(view)) { - connect(view->engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit())); + connect(view->engine(), &QQmlEngine::quit, QCoreApplication::instance(), &QCoreApplication::quit); view->setResizeMode(QQuickView::SizeRootObjectToView); } |