diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-31 16:04:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 16:46:04 +0200 |
| commit | bdd29d20d7d21d82170ffe2cb74412987210dd0d (patch) | |
| tree | ec5c12b7f025eeca39efde7291747ff72828c0eb /tests | |
| parent | ca6b7e43ca14eb01fbad41bbe66101664d452b45 (diff) | |
Fix compilation on QNX
Task-number: QTBUG-37979
Change-Id: Ie877317cded5b9eaf95389344712c66192696552
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qv4debugger/tst_qv4debugger.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp index 15a6acc272..b7e5cf48e0 100644 --- a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp +++ b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp @@ -48,6 +48,9 @@ using namespace QV4; using namespace QV4::Debugging; +typedef QV4::ReturnedValue (*InjectedFunction)(QV4::CallContext*); +Q_DECLARE_METATYPE(InjectedFunction) + static bool waitForSignal(QObject* obj, const char* signal, int timeout = 10000) { QEventLoop loop; @@ -80,9 +83,7 @@ public: QV4::ExecutionEngine *v4Engine() { return QV8Engine::getV4(this); } - typedef QV4::ReturnedValue (*InjectedFunction)(QV4::CallContext*); - - Q_INVOKABLE void injectFunction(const QString &functionName, TestEngine::InjectedFunction injectedFunction) + Q_INVOKABLE void injectFunction(const QString &functionName, InjectedFunction injectedFunction) { QV4::ExecutionEngine *v4 = v4Engine(); QV4::Scope scope(v4); @@ -96,7 +97,6 @@ signals: void evaluateFinished(); }; -Q_DECLARE_METATYPE(TestEngine::InjectedFunction) namespace { class TestCollector: public QV4::Debugging::Debugger::Collector @@ -404,7 +404,7 @@ void tst_qv4debugger::removeBreakPointForNextInstruction() "var i = 42;"; QMetaObject::invokeMethod(m_engine, "injectFunction", Qt::BlockingQueuedConnection, - Q_ARG(QString, "someCall"), Q_ARG(TestEngine::InjectedFunction, someCall)); + Q_ARG(QString, "someCall"), Q_ARG(InjectedFunction, someCall)); m_debuggerAgent->addBreakPoint("removeBreakPointForNextInstruction", 2); |