From 0c3d898a03b675c942e5c8a798b54676d3edf3ae Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 25 Oct 2011 11:28:47 +0200 Subject: Tests: Remove Q_WS_QPA, qpa-sections from .profiles. Compile without -qpa. - Make Q_WS_QPA-#ifdefed sections the default in the code - Replace some Q_WS_ by Q_OS_ - Add ### fixme for places that need checking - Remove qpa conditionals from .pro files. Change-Id: I6ea930afc0c236cc12a7b7e95f1b8a1c24b3a513 Reviewed-by: Friedemann Kleint --- .../widgets/dialogs/qfontdialog/qfontdialog.pro | 7 +++--- .../qgraphicsgridlayout/qgraphicsgridlayout.pro | 3 ++- .../graphicsview/qgraphicsitem/qgraphicsitem.pro | 3 ++- .../qgraphicsproxywidget/qgraphicsproxywidget.pro | 3 ++- .../graphicsview/qgraphicsscene/qgraphicsscene.pro | 3 ++- .../graphicsview/qgraphicsview/qgraphicsview.pro | 3 ++- tests/auto/widgets/kernel/qaction/tst_qaction.cpp | 7 +++--- tests/auto/widgets/kernel/qsound/qsound.pro | 2 +- tests/auto/widgets/kernel/qsound/tst_qsound.cpp | 7 +----- tests/auto/widgets/kernel/qwidget/qwidget.pro | 7 +++--- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 25 +++++++++++----------- .../util/qsystemtrayicon/tst_qsystemtrayicon.cpp | 3 +-- tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 4 ++-- tests/auto/widgets/widgets/qtextedit/qtextedit.pro | 2 +- 14 files changed, 39 insertions(+), 40 deletions(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro b/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro index 9203b17b7a..ff7fbb05a7 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro +++ b/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro @@ -6,8 +6,9 @@ QT += core-private gui-private SOURCES += tst_qfontdialog.cpp -mac:!qpa { - OBJECTIVE_SOURCES += tst_qfontdialog_mac_helpers.mm - LIBS += -framework Cocoa +mac { +# ### fixme +# OBJECTIVE_SOURCES += tst_qfontdialog_mac_helpers.mm +# LIBS += -framework Cocoa } diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/qgraphicsgridlayout.pro b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/qgraphicsgridlayout.pro index afdf133516..b32c638948 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/qgraphicsgridlayout.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/qgraphicsgridlayout.pro @@ -4,4 +4,5 @@ TARGET = tst_qgraphicsgridlayout QT += widgets testlib SOURCES += tst_qgraphicsgridlayout.cpp CONFIG += parallel_test -contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb +# ### fixme: QTBUG-20756 crashes on xcb +contains(QT_CONFIG,xcb):CONFIG+=insignificant_test diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro index 4cda6009f4..0d4b046839 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro @@ -7,4 +7,5 @@ DEFINES += QT_NO_CAST_TO_ASCII win32:!wince*: LIBS += -lUser32 -contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb +# ### fixme: QTBUG-20756 crashes on xcb +contains(QT_CONFIG,xcb):CONFIG+=insignificant_test diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro index 2dcaf70243..50f4f7ab74 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro @@ -6,4 +6,5 @@ QT += core-private gui-private SOURCES += tst_qgraphicsproxywidget.cpp -contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb +# ### fixme: QTBUG-20756 crashes on xcb +contains(QT_CONFIG,xcb):CONFIG+=insignificant_test diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro index 6c1a3f5c02..b45cdc77da 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro @@ -18,4 +18,5 @@ wince* { DEFINES += SRCDIR=\\\".\\\" } -contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb +# ### fixme: QTBUG-20756 crashes on xcb +contains(QT_CONFIG,xcb):CONFIG+=insignificant_test diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro index 2aa782fc92..f78bd4f470 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro @@ -7,4 +7,5 @@ QT += core-private gui-private SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp DEFINES += QT_NO_CAST_TO_ASCII -contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb +# ### fixme: QTBUG-20756 crashes on xcb +contains(QT_CONFIG,xcb):CONFIG+=insignificant_test diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp index 637ec144d2..560713a064 100644 --- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp +++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp @@ -240,13 +240,12 @@ void tst_QAction::setStandardKeys() QVERIFY(act.shortcut() == act.shortcuts().first()); QList expected; -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) expected << QKeySequence("CTRL+C"); -#elif defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_QPA) - expected << QKeySequence("CTRL+C") << QKeySequence("CTRL+INSERT"); #else - expected << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT"); + expected << QKeySequence("CTRL+C") << QKeySequence("CTRL+INSERT"); #endif +// Qt/Embedded on Windows: expected << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT"); QVERIFY(act.shortcuts() == expected); } diff --git a/tests/auto/widgets/kernel/qsound/qsound.pro b/tests/auto/widgets/kernel/qsound/qsound.pro index 4142afc88c..8317283d54 100644 --- a/tests/auto/widgets/kernel/qsound/qsound.pro +++ b/tests/auto/widgets/kernel/qsound/qsound.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qsound SOURCES += tst_qsound.cpp -QT += testlib +QT += testlib widgets wince* { deploy.files += 4.wav diff --git a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp index 1b8907b1be..5f1e5fb47c 100644 --- a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp +++ b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp @@ -41,7 +41,7 @@ #include -#include +#include class tst_QSound : public QObject { @@ -59,9 +59,7 @@ private slots: void tst_QSound::checkFinished() { -#if defined(Q_WS_QPA) QSKIP("QSound is not implemented on Lighthouse"); -#else QSound sound(SRCDIR"4.wav"); sound.setLoops(3); sound.play(); @@ -71,17 +69,14 @@ void tst_QSound::checkFinished() QEXPECT_FAIL("", "QSound buggy on embedded (task QTBUG-157)", Abort); #endif QVERIFY(sound.isFinished() ); -#endif } void tst_QSound::staticPlay() { QSKIP("Test disabled -- only for manual purposes"); -#if !defined(Q_WS_QPA) // Check that you hear sound with static play also. QSound::play(SRCDIR"4.wav"); QTest::qWait(2000); -#endif } QTEST_MAIN(tst_QSound); diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro index e6ec3b92f9..33b95d7d2b 100644 --- a/tests/auto/widgets/kernel/qwidget/qwidget.pro +++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro @@ -10,9 +10,10 @@ aix-g++*:QMAKE_CXXFLAGS+=-fpermissive CONFIG += x11inc -mac:!qpa { - LIBS += -framework Security -framework AppKit -framework Carbon - OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm +mac { +# ### fixme +# LIBS += -framework Security -framework AppKit -framework Carbon +# OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm } x11 { diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index e92389ff62..c508c15a88 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -380,7 +380,7 @@ private slots: void setClearAndResizeMask(); void maskedUpdate(); -#if defined(Q_WS_X11) || (defined(Q_WS_WIN) && !defined(Q_OS_WINCE_WM)) || defined(Q_WS_QWS) || defined(Q_WS_QPA) +#if !defined(Q_OS_WINCE_WM) void syntheticEnterLeave(); void taskQTBUG_4055_sendSyntheticEnterLeave(); #endif @@ -1931,8 +1931,9 @@ void tst_QWidget::showMaximized() layouted.showNormal(); QVERIFY(!(layouted.windowState() & Qt::WindowMaximized)); -#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_QPA) -//embedded may choose a different size to fit on the screen. + // ### fixme: embedded may choose a different size to fit on the screen. + // Check platforms (QTBUG-22326) +#if 0 QCOMPARE(layouted.size(), layouted.sizeHint()); #endif layouted.showMaximized(); @@ -2008,8 +2009,8 @@ void tst_QWidget::showFullScreen() layouted.showNormal(); QVERIFY(!(layouted.windowState() & Qt::WindowFullScreen)); -#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_QPA) -//embedded may choose a different size to fit on the screen. + // ### fixme: embedded may choose a different size to fit on the screen. (QTBUG-22326) +#if 0 QCOMPARE(layouted.size(), layouted.sizeHint()); #endif @@ -3278,9 +3279,8 @@ void tst_QWidget::widgetAt() #if defined(Q_OS_WINCE) QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191 #endif -#if defined(Q_WS_QPA) - QEXPECT_FAIL("", "Window mask not implemented on Lighthouse", Continue); -#endif + /// ### fixme: Check platforms + QEXPECT_FAIL("", "Window mask not implemented on Lighthouse QTBUG-22326", Continue); QTRY_COMPARE(QApplication::widgetAt(100,100)->objectName(), w1->objectName()); QTRY_COMPARE(QApplication::widgetAt(101,101)->objectName(), w2->objectName()); @@ -3297,9 +3297,8 @@ void tst_QWidget::widgetAt() #if defined(Q_OS_WINCE) QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191 #endif -#if defined(Q_WS_QPA) - QEXPECT_FAIL("", "Window mask not implemented on Lighthouse", Continue); -#endif + /// ### fixme: Check platforms + QEXPECT_FAIL("", "Window mask not implemented on Lighthouse QTBUG-22326", Continue); QTRY_VERIFY(QApplication::widgetAt(100,100) == w1); QTRY_VERIFY(QApplication::widgetAt(101,101) == w2); @@ -8632,7 +8631,7 @@ void tst_QWidget::maskedUpdate() } // Windows Mobile has no proper cursor support, so skip this test on that platform. -#if defined(Q_WS_X11) || (defined(Q_WS_WIN) && !defined(Q_OS_WINCE_WM)) || defined(Q_WS_QWS) || defined(Q_WS_QPA) +#if !defined(Q_OS_WINCE_WM) void tst_QWidget::syntheticEnterLeave() { class MyWidget : public QWidget @@ -8737,7 +8736,7 @@ void tst_QWidget::syntheticEnterLeave() #endif // Windows Mobile has no proper cursor support, so skip this test on that platform. -#if defined(Q_WS_X11) || (defined(Q_WS_WIN) && !defined(Q_OS_WINCE_WM)) || defined(Q_WS_QWS) || defined(Q_WS_QPA) +#if !defined(Q_OS_WINCE_WM) void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave() { class SELParent : public QWidget diff --git a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp index a4a5ed7ad9..a226e4521b 100644 --- a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp +++ b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp @@ -122,9 +122,8 @@ void tst_QSystemTrayIcon::getSetCheck() void tst_QSystemTrayIcon::supportsMessages() { -#ifdef Q_WS_QPA + // ### fixme: Check platforms. QEXPECT_FAIL("", "QTBUG-20978 QSystemTrayIcon is unimplemented for qpa", Abort); -#endif #if !defined(Q_WS_QWS) QCOMPARE(QSystemTrayIcon::supportsMessages(), true ); diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 306cd892ed..ef50a52953 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -773,9 +773,9 @@ public: #ifndef Q_OS_WINCE_WM void tst_QMenu::task258920_mouseBorder() { -#ifdef Q_WS_QPA + // ### fixme: Check platforms QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa"); -#endif + Menu258920 menu; // For styles which inherit from QWindowsStyle, styleHint(QStyle::SH_Menu_MouseTracking) is true. menu.setMouseTracking(true); diff --git a/tests/auto/widgets/widgets/qtextedit/qtextedit.pro b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro index c89af425d5..85658c222e 100644 --- a/tests/auto/widgets/widgets/qtextedit/qtextedit.pro +++ b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro @@ -16,4 +16,4 @@ wince* { DEFINES += SRCDIR=\\\"$$PWD/\\\" } -contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb +contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-20756 crashes on xcb -- cgit v1.2.3