diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-18 08:48:07 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-18 00:07:51 +0100 |
commit | 70d91b5c46ea821b75ecb9c0091e8e425456dae5 (patch) | |
tree | a0e768d7beb7aa6e995f83af2e28be94ecbb4bb3 /tests/auto | |
parent | e9478a1e8a2c49560c8964fc7bf5d6172f6978b2 (diff) |
Fixed compile of autotests with -qtnamespace.
Make sure to use the Qt namespace for qGlobalPostedEventsCount.
Change-Id: I558a0b0fba1e22a2edd96f9499a2bab82046c4a4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp | 1 | ||||
-rw-r--r-- | tests/auto/corelib/thread/qthread/tst_qthread.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index 09f31414a6..6a2d04d46d 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -597,7 +597,6 @@ public: return false; } bool hasPendingEvents() { - extern uint qGlobalPostedEventsCount(); // from qapplication.cpp return qGlobalPostedEventsCount(); } void registerSocketNotifier(QSocketNotifier *) {} diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index 7c0d8cdc48..302fb0296f 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -1221,6 +1221,10 @@ void tst_QThread::isRunningInFinished() } } +QT_BEGIN_NAMESPACE +Q_CORE_EXPORT uint qGlobalPostedEventsCount(); +QT_END_NAMESPACE + class DummyEventDispatcher : public QAbstractEventDispatcher { public: DummyEventDispatcher() : QAbstractEventDispatcher(), visited(false) {} @@ -1231,7 +1235,6 @@ public: return false; } bool hasPendingEvents() { - extern uint qGlobalPostedEventsCount(); // from qapplication.cpp return qGlobalPostedEventsCount(); } void registerSocketNotifier(QSocketNotifier *) {} |