diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:20:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:22:47 +0200 |
| commit | 39888db8b34767974d4a443bfe40b9e84fed315a (patch) | |
| tree | 2133759c6c2e91ff65b886c70093f4f52c7bbba5 /examples | |
| parent | fd295c5047095806db2015a978ed593a140ff373 (diff) | |
| parent | 5c221826025276aea5ee19275f350a28e02db254 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/quick/doc/src/qmltypereference.qdoc
Change-Id: Ia58f1c5a98309c32ef8d8e5c893faf261215f19f
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qml/qmlextensionplugins/plugin.cpp | 2 | ||||
| -rw-r--r-- | examples/quick/scenegraph/customgeometry/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/qml/qmlextensionplugins/plugin.cpp b/examples/qml/qmlextensionplugins/plugin.cpp index e04cfa57d8..8e016b8ae5 100644 --- a/examples/qml/qmlextensionplugins/plugin.cpp +++ b/examples/qml/qmlextensionplugins/plugin.cpp @@ -82,7 +82,7 @@ protected: QTime now = QTime::currentTime(); if (now.second() == 59 && now.minute() == time.minute() && now.hour() == time.hour()) { // just missed time tick over, force it, wait extra 0.5 seconds - time.addSecs(60); + time = time.addSecs(60); timer.start(60500, this); } else { time = now; diff --git a/examples/quick/scenegraph/customgeometry/main.cpp b/examples/quick/scenegraph/customgeometry/main.cpp index bbbbf64c4c..6f3c24e87b 100644 --- a/examples/quick/scenegraph/customgeometry/main.cpp +++ b/examples/quick/scenegraph/customgeometry/main.cpp @@ -67,6 +67,6 @@ int main(int argc, char **argv) view.setSource(QUrl("qrc:///scenegraph/customgeometry/main.qml")); view.show(); - app.exec(); + return app.exec(); } //! [1] |