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/kernel | |
| 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/kernel')
| -rw-r--r-- | tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index bdcfb00ba1..4f6c7defda 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -55,7 +55,7 @@ class tst_QClipboard : public QObject { Q_OBJECT private slots: -#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_QPA) && !defined(QT_NO_PROCESS) +#if (defined(Q_OS_WIN) || defined(Q_OS_MAC)) && !defined(QT_NO_PROCESS) void copy_exit_paste(); #endif void capabiliyFunctions(); @@ -191,14 +191,14 @@ void tst_QClipboard::testSignals() // This test does not make sense on X11 and embedded, as copied data disappears // from the clipboard when the application exits. It's still possible to test // copy/paste - just keep the apps running. -#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_QPA) && !defined(QT_NO_PROCESS) +#if (defined(Q_OS_WIN) || defined(Q_OS_MAC)) && !defined(QT_NO_PROCESS) void tst_QClipboard::copy_exit_paste() { if (!nativeClipboardWorking()) QSKIP("Native clipboard not working in this setup"); const QStringList stringArgument = QStringList() << "Test string."; QCOMPARE(QProcess::execute("copier/copier", stringArgument), 0); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC // The Pasteboard needs a moment to breathe (at least on older Macs). QTest::qWait(100); #endif |