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/widgets/kernel/qaction/tst_qaction.cpp | |
| 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/widgets/kernel/qaction/tst_qaction.cpp')
| -rw-r--r-- | tests/auto/widgets/kernel/qaction/tst_qaction.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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<QKeySequence> 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); } |