diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-16 17:34:09 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 11:43:34 +0200 |
| commit | fa896f03c2007025ebc90709e079901eab975ae0 (patch) | |
| tree | 9c6e144ac26ceda8ca719cfeb52b078fcd65369f /tests | |
| parent | 87618403976aa82450895da6196a944195980de7 (diff) | |
Activate native window tests of QMdiArea.
Change-Id: Ic272b5e28256e454a3186d4407d009c9331b292b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 4a0478394d..11636b660b 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -288,9 +288,7 @@ private slots: void setTabShape(); void setTabPosition_data(); void setTabPosition(); -#if defined(Q_WS_WIN) || defined(Q_WS_X11) void nativeSubWindows(); -#endif void task_209615(); void task_236750(); @@ -2599,9 +2597,12 @@ void tst_QMdiArea::setTabPosition() qApp->setLayoutDirection(originalLayoutDirection); } -#if defined(Q_WS_WIN) || defined(Q_WS_X11) void tst_QMdiArea::nativeSubWindows() { + const QString platformName = QGuiApplication::platformName(); + if (platformName != QLatin1String("xcb") && platformName != QLatin1String("windows")) + QSKIP(qPrintable(QString::fromLatin1("nativeSubWindows() does not work on this platform (%1).").arg(platformName))); + { // Add native widgets after show. QMdiArea mdiArea; mdiArea.addSubWindow(new QWidget); @@ -2616,7 +2617,8 @@ void tst_QMdiArea::nativeSubWindows() QWidget *nativeWidget = new QWidget; QVERIFY(nativeWidget->winId()); // enforce native window. - mdiArea.addSubWindow(nativeWidget); + QMdiSubWindow *subWin = mdiArea.addSubWindow(nativeWidget); + QVERIFY(subWin->internalWinId()); // The viewport and all the sub-windows must be native. QVERIFY(mdiArea.viewport()->internalWinId()); @@ -2687,7 +2689,6 @@ void tst_QMdiArea::nativeSubWindows() } #endif } -#endif void tst_QMdiArea::task_209615() { |