From 62e9d51c46362f5eea1d5d5b86119d3faf5ed07d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 27 Nov 2015 09:44:57 +0100 Subject: [PATCH] Macros: Add JS:Util.relativeFilePath(path, base) Task-number: QTCREATORBUG-14562 Change-Id: Ib0c3ea442d7b2c92cedda7a5933ce73c64acc7e2 Reviewed-by: Tobias Hunger --- src/plugins/coreplugin/corejsextensions.cpp | 5 +++++ src/plugins/coreplugin/corejsextensions.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/plugins/coreplugin/corejsextensions.cpp b/src/plugins/coreplugin/corejsextensions.cpp index 199b960893a..3d78a74da12 100644 --- a/src/plugins/coreplugin/corejsextensions.cpp +++ b/src/plugins/coreplugin/corejsextensions.cpp @@ -87,6 +87,11 @@ QString UtilsJsExtension::absoluteFilePath(const QString &in) const return fi.absoluteFilePath(); } +QString UtilsJsExtension::relativeFilePath(const QString &path, const QString &base) const +{ + return QDir(base).relativeFilePath(path); +} + bool UtilsJsExtension::exists(const QString &in) const { return QFileInfo::exists(in); diff --git a/src/plugins/coreplugin/corejsextensions.h b/src/plugins/coreplugin/corejsextensions.h index 0f6ed1273cc..3ac04bf38f0 100644 --- a/src/plugins/coreplugin/corejsextensions.h +++ b/src/plugins/coreplugin/corejsextensions.h @@ -58,6 +58,8 @@ public: Q_INVOKABLE QString path(const QString &in) const; Q_INVOKABLE QString absoluteFilePath(const QString &in) const; + Q_INVOKABLE QString relativeFilePath(const QString &path, const QString &base) const; + // File checks: Q_INVOKABLE bool exists(const QString &in) const; Q_INVOKABLE bool isDirectory(const QString &in) const;