diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-11-13 15:16:05 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-11-13 15:16:34 (GMT) |
| commit | 3a48a44f39a39126a9065f9b349b8906662f07b6 (patch) | |
| tree | 89cac3d3f8e29e4ddc96803203f3f337dbad8c9c | |
| parent | 2432150f9eabbaa0317eeed038eaf661f8ce507e (diff) | |
| download | Qt-3a48a44f39a39126a9065f9b349b8906662f07b6.zip Qt-3a48a44f39a39126a9065f9b349b8906662f07b6.tar.gz Qt-3a48a44f39a39126a9065f9b349b8906662f07b6.tar.bz2 | |
Fixed dockwidget autotest on X11
| -rw-r--r-- | tests/auto/qdockwidget/tst_qdockwidget.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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); |