Merge remote-tracking branch 'origin/4.6'

Change-Id: I63f8aebb201936f671b1486ff9420f67e5e3fafc
2018-03-01 15:46:37 +01:00
parent 5e2ad9457f ec571d86fd
commit 205c930592
36 changed files with 298 additions and 73 deletions
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -75,6 +75,7 @@ public:

    void refreshProjectFile();

+    static QStringList makeAbsolute(const Utils::FileName &path, const QStringList &relativePaths);
 protected:
    RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
    bool setupTarget(ProjectExplorer::Target *t) override;