diff options
author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-10-28 12:48:00 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2016-01-04 13:59:14 +0000 |
commit | 374d35d5ba7ceb4a95bcbe83d538a27a0283662b (patch) | |
tree | d18944ecd03e29992284b20cb837a15b2131c238 /tests/auto/widgets/util | |
parent | eaa3a9d0108cdf692f1686cafefb7b834f0e5af6 (diff) |
Make use of preprocessor easier to understand.
The #if had a condition that was needlessly hard to understand;
and was widely separated from its #else clause.
Change-Id: I43f4282993f4f2e8c4b5ad07dc2c2e06a6b95aa9
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'tests/auto/widgets/util')
-rw-r--r-- | tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp index 781adeedad..9f03e9b3a0 100644 --- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp @@ -36,7 +36,22 @@ #include <QAction> // Temporarily disabling IRIX due to build issuues with GCC -#if !defined(__sgi) || defined(__sgi) && !defined(__GNUC__) +#if defined(__sgi) && defined(__GNUC__) + +class tst_QUndoGroup : public QObject +{ + Q_OBJECT +public: + tst_QUndoGroup() {} + +private slots: + void setActive() { QSKIP( "Not tested on irix-g++"); } + void addRemoveStack() { QSKIP( "Not tested on irix-g++"); } + void deleteStack() { QSKIP( "Not tested on irix-g++"); } + void checkSignals() { QSKIP( "Not tested on irix-g++"); } + void addStackAndDie() { QSKIP( "Not tested on irix-g++"); } +}; +#else /****************************************************************************** ** Commands @@ -645,22 +660,7 @@ void tst_QUndoGroup::commandTextFormat() qApp->removeTranslator(&translator); #endif } - -#else -class tst_QUndoGroup : public QObject -{ - Q_OBJECT -public: - tst_QUndoGroup() {} - -private slots: - void setActive() { QSKIP( "Not tested on irix-g++"); } - void addRemoveStack() { QSKIP( "Not tested on irix-g++"); } - void deleteStack() { QSKIP( "Not tested on irix-g++"); } - void checkSignals() { QSKIP( "Not tested on irix-g++"); } - void addStackAndDie() { QSKIP( "Not tested on irix-g++"); } -}; -#endif +#endif // !(SGI && GCC) QTEST_MAIN(tst_QUndoGroup) |