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>
bb10
Edward Welbourne 2015-10-28 12:48:00 +01:00
parent eaa3a9d010
commit 374d35d5ba
1 changed files with 17 additions and 17 deletions

View File

@ -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)