diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-12-12 16:24:52 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-22 02:28:09 +0100 |
| commit | d62228a77e3f4990623636519836874a66baffbb (patch) | |
| tree | 8fc8faf362f8d3e4b0bf1fe74726285a52c2b6b9 /tests/auto | |
| parent | 1b51079e48d647a3863ff8a996e60c45f6e62fdb (diff) | |
Fix compile error when configured with -no-exceptions
The test was skipped, but still tried to compile code that uses
exceptions. The throwing class it uses was conditionally compiled
out earlier in the file, causing an error for undefined class.
Task-number: QTBUG-23028
Change-Id: Ia2e05a8a0abbf0e913f6c41e85bfee8b85cbc8a5
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index aab405fa97..f48a8ebfaf 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -322,7 +322,9 @@ void tst_QEventLoop::throwInExec() // qobject.cpp will try to rethrow the exception after handling // which causes gwes.exe to crash QSKIP("This platform doesn't support propagating exceptions through the event loop"); -#elif defined(Q_OS_LINUX) +#else + // exceptions compiled in, runtime tests follow. +#if defined(Q_OS_LINUX) // C++ exceptions can't be passed through glib callbacks. Skip the test if // we're using the glib event loop. QByteArray dispatcher = QAbstractEventDispatcher::instance()->metaObject()->className(); @@ -357,6 +359,7 @@ void tst_QEventLoop::throwInExec() } QCOMPARE(caughtExceptions, 2); } +#endif } void tst_QEventLoop::reexec() |