diff options
| author | hjk <hjk@qt.io> | 2019-08-26 18:42:51 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-09-02 11:09:17 +0000 |
| commit | ee23dcba232235cae53838e4d22b5f649301ed92 (patch) | |
| tree | 7150ca50881eb4ae7838af943fbf6347ffb4bc56 /src/plugins/debugger/qml/qmlengine.cpp | |
| parent | 6ad670a980a094a9ebe75149fa36f4963cf32772 (diff) | |
| download | qt-creator-ee23dcba232235cae53838e4d22b5f649301ed92.tar.gz | |
Debugger: Move toFileInProject to QmlEngine
The only user.
Change-Id: I443cbfab20739fb43a45848355110f879b0f3041
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 9aa619b99f..2914998421 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -60,6 +60,7 @@ #include <app/app_version.h> #include <utils/treemodel.h> #include <utils/basetreeview.h> +#include <utils/fileinprojectfinder.h> #include <utils/qtcassert.h> #include <QDebug> @@ -234,6 +235,8 @@ public: QHash<int, QmlCallback> callbackForToken; + FileInProjectFinder fileFinder; + private: ConsoleItem *constructLogItemTree(const QmlV8ObjectData &objectData, QList<int> &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; |