From 0fd8514a57ec8c6bd824e3c30a559988c53b95c8 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 24 Oct 2011 13:09:50 +0200 Subject: Fix QDialog test: Q_WS_X11 is no more. Change-Id: Ia4182b22f4a4999a80d7792378e1b9dfa03e7f9c Reviewed-by: Kristoffer Flottorp --- tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') 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); -- cgit v1.2.3