diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-10-24 13:09:50 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 15:17:00 +0200 |
commit | 0fd8514a57ec8c6bd824e3c30a559988c53b95c8 (patch) | |
tree | e92be5aeb2c17f2725e665bcfb3f46cecd88937e /tests/auto | |
parent | 3ff8e949257270d6b6d4883cf3f9001e8ae7e927 (diff) |
Fix QDialog test: Q_WS_X11 is no more.
Change-Id: Ia4182b22f4a4999a80d7792378e1b9dfa03e7f9c
Reviewed-by: Kristoffer Flottorp <kristoffer.flottorp@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 78458d4531..80eb717790 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -75,7 +75,7 @@ private slots: void showMaximized(); void showMinimized(); void showFullScreen(); -#if !defined(Q_WS_X11) && !defined(Q_OS_WINCE) +#if !defined(Q_OS_UNIX) && !defined(Q_OS_WINCE) void showAsTool(); #endif #ifndef Q_OS_WINCE @@ -374,7 +374,7 @@ void tst_QDialog::showFullScreen() // Qt/X11: Skipped since activeWindow() is not respected by all window managers. // Qt/WinCE: No real support for Qt::Tool on WinCE. -#if !defined(Q_WS_X11) && !defined(Q_OS_WINCE) +#if !defined(Q_OS_UNIX) && !defined(Q_OS_WINCE) void tst_QDialog::showAsTool() { ToolDialog dialog(testWidget); |