From 3a48a44f39a39126a9065f9b349b8906662f07b6 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Fri, 13 Nov 2009 16:16:05 +0100
Subject: Fixed dockwidget autotest on X11

---
 tests/auto/qdockwidget/tst_qdockwidget.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qdockwidget/tst_qdockwidget.cpp b/tests/auto/qdockwidget/tst_qdockwidget.cpp
index c9a7f1c..8f72e39 100644
--- a/tests/auto/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/qdockwidget/tst_qdockwidget.cpp
@@ -50,6 +50,7 @@
 #include <qlineedit.h>
 #include <QDesktopWidget>
 #include <QtGui/QPainter>
+#include "private/qdockwidget_p.h"
 
 bool hasFeature(QDockWidget *dockwidget, QDockWidget::DockWidgetFeature feature)
 { return (dockwidget->features() & feature) == feature; }
@@ -865,7 +866,9 @@ void tst_QDockWidget::taskQTBUG_1665_closableChanged()
     dock.show();
     QTest::qWaitForWindowShown(&dock);
 
-    if (dock.windowFlags() & Qt::FramelessWindowHint)
+    QDockWidgetLayout *l = qobject_cast<QDockWidgetLayout*>(dock.layout());
+
+    if (l && !l->nativeWindowDeco())
         QSKIP("this machine doesn't support native dock widget", SkipAll);
 
     QVERIFY(dock.windowFlags() & Qt::WindowCloseButtonHint);
-- 
cgit v0.12