diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 624440c5faa..86fe38bf21d 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -74,7 +74,6 @@ #include #include -#include #include #include #include @@ -485,7 +484,6 @@ public: QScopedPointer m_locationMark; QTimer m_locationTimer; - Utils::FileInProjectFinder m_fileFinder; QString m_qtNamespace; // Safety net to avoid infinite lookups. @@ -1864,18 +1862,6 @@ bool DebuggerEngine::canDisplayTooltip() const return state() == InferiorStopOk; } -QString DebuggerEngine::toFileInProject(const QUrl &fileUrl) -{ - // make sure file finder is properly initialized - const DebuggerRunParameters &rp = runParameters(); - d->m_fileFinder.setProjectDirectory(rp.projectSourceDirectory); - d->m_fileFinder.setProjectFiles(rp.projectSourceFiles); - d->m_fileFinder.setAdditionalSearchDirectories(rp.additionalSearchDirectories); - d->m_fileFinder.setSysroot(rp.sysRoot); - - return d->m_fileFinder.findFile(fileUrl).first().toString(); -} - QString DebuggerEngine::expand(const QString &string) const { return runParameters().macroExpander->expand(string); diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 4cbb7569952..f4ba9e47cb0 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -405,8 +405,6 @@ public: virtual bool canDisplayTooltip() const; - QString toFileInProject(const QUrl &fileUrl); - QString expand(const QString &string) const; QString nativeStartupCommands() const; Utils::Perspective *perspective() const; diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 9aa619b99f1..29149984212 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -60,6 +60,7 @@ #include #include #include +#include #include #include @@ -234,6 +235,8 @@ public: QHash callbackForToken; + FileInProjectFinder fileFinder; + private: ConsoleItem *constructLogItemTree(const QmlV8ObjectData &objectData, QList &seenHandles); void constructChildLogItems(ConsoleItem *item, const QmlV8ObjectData &objectData, @@ -2434,6 +2437,18 @@ void QmlEnginePrivate::flushSendBuffer() sendBuffer.clear(); } +QString QmlEngine::toFileInProject(const QUrl &fileUrl) +{ + // make sure file finder is properly initialized + const DebuggerRunParameters &rp = runParameters(); + d->fileFinder.setProjectDirectory(rp.projectSourceDirectory); + d->fileFinder.setProjectFiles(rp.projectSourceFiles); + d->fileFinder.setAdditionalSearchDirectories(rp.additionalSearchDirectories); + d->fileFinder.setSysroot(rp.sysRoot); + + return d->fileFinder.findFile(fileUrl).first().toString(); +} + DebuggerEngine *createQmlEngine() { return new QmlEngine; diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index df31c3c6c5f..5101e91bc40 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -50,6 +50,7 @@ public: void logServiceActivity(const QString &service, const QString &logMessage); void expressionEvaluated(quint32 queryId, const QVariant &result); + QString toFileInProject(const QUrl &fileUrl); private: void disconnected();