diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-25 11:28:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 09:50:30 +0200 |
| commit | 0c3d898a03b675c942e5c8a798b54676d3edf3ae (patch) | |
| tree | 3e9ea3d434f80fc6bc43c9249c53a7d8b12cc180 /tests/auto/gui/painting | |
| parent | 3849455ee791d6f5cd4b87253732827d40e5d28a (diff) | |
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 <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/gui/painting')
| -rw-r--r-- | tests/auto/gui/painting/qprinter/tst_qprinter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp index 43524649ae..995f4ab113 100644 --- a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp +++ b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp @@ -82,9 +82,9 @@ private slots: void testSetOptions(); void testMargins_data(); void testMargins(); -#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_QPA) && !defined(Q_OS_MAC) +#ifdef Q_OS_WIN void testNonExistentPrinter(); -#endif +#endif // Q_OS_WIN void testPageSetupDialog(); void testMulitpleSets_data(); void testMulitpleSets(); @@ -384,8 +384,7 @@ void tst_QPrinter::testMargins() delete painter; } -// QPrinter::testNonExistentPrinter() is not relevant for some platforms. -#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_QPA) && !defined(Q_OS_MAC) +#ifdef Q_OS_WIN void tst_QPrinter::testNonExistentPrinter() { QPrinter printer; @@ -416,7 +415,7 @@ void tst_QPrinter::testNonExistentPrinter() QVERIFY(!painter.begin(&printer)); } -#endif +#endif // Q_OS_WIN void tst_QPrinter::testMulitpleSets_data() { |