diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:42:21 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:42:21 +0200 |
| commit | 1d3b9db5b54d8ae99c6b149c8d3d91eda19b5838 (patch) | |
| tree | 9ffbf9d6d2ed6b0aef6155215767c56655ff405b /tests/auto/quick/rendernode/tst_rendernode.cpp | |
| parent | 45792359f25813af18b7416e4c18737ed4b20bff (diff) | |
| parent | 0316506d9ddbc3ca9f26f880b9e7fb5d5b0fec36 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557
Diffstat (limited to 'tests/auto/quick/rendernode/tst_rendernode.cpp')
| -rw-r--r-- | tests/auto/quick/rendernode/tst_rendernode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/rendernode/tst_rendernode.cpp b/tests/auto/quick/rendernode/tst_rendernode.cpp index 509b209654..04b32499ff 100644 --- a/tests/auto/quick/rendernode/tst_rendernode.cpp +++ b/tests/auto/quick/rendernode/tst_rendernode.cpp @@ -59,7 +59,7 @@ public: QQuickView view; view.setSource(testFileUrl(fileName)); - view.show(); + view.showNormal(); QTest::qWaitForWindowExposed(&view); return view.grabWindow(); |