From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 16 Jul 2012 15:34:09 +0000 (+0200)
Subject: Activate native window tests of QMdiArea.
X-Git-Tag: v5.0.0-beta1~688
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa896f03c2007025ebc90709e079901eab975ae0;p=profile%2Fivi%2Fqtbase.git

Activate native window tests of QMdiArea.

Change-Id: Ic272b5e28256e454a3186d4407d009c9331b292b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---

diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 4a04783..11636b6 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()
 {