AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autotest: Fix build error with QT_NO_EXCEPTIONS

Browse Source 
The function declaration has to be in the same ifdefs as the
implementation.

Change-Id: I78c5795baef4adba7439f66252819963db164759
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
This commit is contained in:
Rainer Keller 2015-08-13 13:44:08 +02:00
parent 6c76fdc761
commit 933745f36b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
View File

@ -1438,6 +1438,8 @@ void tst_QFuture::nestedExceptions()
QVERIFY(MyClass::caught); QVERIFY(MyClass::caught);
} }
#endif // QT_NO_EXCEPTIONS
void tst_QFuture::nonGlobalThreadPool() void tst_QFuture::nonGlobalThreadPool()
{ {
static Q_CONSTEXPR int Answer = 42; static Q_CONSTEXPR int Answer = 42;
@ -1485,7 +1487,5 @@ void tst_QFuture::nonGlobalThreadPool()
} }
} }
#endif // QT_NO_EXCEPTIONS
QTEST_MAIN(tst_QFuture) QTEST_MAIN(tst_QFuture)
#include "tst_qfuture.moc" #include "tst_qfuture.moc"