diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-14 01:00:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-14 01:00:09 +0100 |
| commit | e6199a8357cb9a97a3de0e86af387ddbe15a18ea (patch) | |
| tree | c33fdae61742736ad47a33ddc2458aed07d53b1b /src/qmltest | |
| parent | 57604562db870f7b05d4349761d73e054dbe04c6 (diff) | |
| parent | 68d0377736a541fa29d1aaba6b7aa4a4cf8781ef (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I2842f4a8096c4555e29f08e65b88b77b841441cb
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktest.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 56180f2dc5..9a73726797 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -61,6 +61,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qeventloop.h> #include <QtCore/qtextstream.h> +#include <QtCore/qtimer.h> #include <QtGui/qtextdocument.h> #include <stdio.h> #include <QtGui/QGuiApplication> @@ -646,7 +647,10 @@ int quick_test_main_with_setup(int argc, char **argv, const char *name, const ch << "Test '" << QDir::toNativeSeparators(path) << "' window not active after requestActivate()."; } if (view.isExposed()) { - QTestRootObject::instance()->setWindowShown(true); + // Defer property update until event loop has started + QTimer::singleShot(0, []() { + QTestRootObject::instance()->setWindowShown(true); + }); } else { qWarning().nospace() << "Test '" << QDir::toNativeSeparators(path) << "' window was never exposed! " |