AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix window activation in tst_qmdiArea::subWindowActivated2

Browse Source 
QApplication::setActiveWindow doesn't activate the native window but
marks the widget as active inside Qt.
We need to use QWidget::activateWindow instead. See docs.

Also moved the activation call further down because on Windows a
minimized window cannot be activated using the activation-by-focus
fake we're currently using.

Change-Id: I752f6ada1f463931fa9cfb3c35f42dbec0207bfa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Joerg Bornemann 2012-07-31 13:14:49 +02:00 committed by Qt by Nokia
parent 5b49793d80
commit 0d8795fcb4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
View File

@ -529,8 +529,8 @@ void tst_QMdiArea::subWindowActivated2()
// For this test, the QMdiArea widget must be active after minimizing and
// showing it again. QMdiArea has no active sub window if it is inactive itself.
qApp->setActiveWindow(&mdiArea);
mdiArea.showNormal();
mdiArea.activateWindow();
QVERIFY(QTest::qWaitForWindowActive(&mdiArea));
QTRY_COMPARE(spy.count(), 1);
QCOMPARE(mdiArea.activeSubWindow(), activeSubWindow);