diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:05:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:06:31 +0200 |
| commit | 5c23199d4e8ff21661dfa5aacc13149178e78cab (patch) | |
| tree | 322aee61581d7c85f1ccb65e47d1e79eba1ba6c9 /tests/auto/opengl/qgl/tst_qgl.cpp | |
| parent | 252bad7c589e03d3e12df02354b00a84d8e3159a (diff) | |
| parent | c8d9b17367cfdcb034d11f8a168ca4ae3993e7c3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/macx-xcode/Info.plist.app
mkspecs/macx-xcode/Info.plist.lib
qmake/doc/qmake.qdocconf
src/corelib/global/qglobal.h
tests/auto/other/exceptionsafety/exceptionsafety.pro
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
Diffstat (limited to 'tests/auto/opengl/qgl/tst_qgl.cpp')
| -rw-r--r-- | tests/auto/opengl/qgl/tst_qgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp index 3fc89acb67..38c92c7610 100644 --- a/tests/auto/opengl/qgl/tst_qgl.cpp +++ b/tests/auto/opengl/qgl/tst_qgl.cpp @@ -1288,7 +1288,7 @@ void tst_QGL::glFBOUseInGLWidget() FBOUseInGLWidget w; w.resize(100, 100); - w.show(); + w.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&w)); @@ -1774,7 +1774,7 @@ void tst_QGL::clipTest() { ClipTestGLWidget glw; glw.resize(220, 220); - glw.show(); + glw.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&glw)); |