Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
  a bunch of .pro and configure.json file adjustments
  and some conflicting cherry-picks from dev -> 5.15
  that are merged into dev again

  src/assistant/assistant/main.cpp

Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2

1 files changed, 7 insertions, 1 deletions

diff --git a/src/qdoc/node.h b/src/qdoc/node.h
index 9f78cc824..b7293f408 100644
--- a/src/qdoc/node.h
+++ b/src/qdoc/node.h
@@ -705,13 +705,19 @@ public:
     void setImageFileName(const QString &ifn) override { imageFileName_ = ifn; }
     const QStringList &files() const { return files_; }
     const QStringList &images() const { return images_; }
-    void setFiles(const QStringList files) { files_ = files; }
+    const QString &projectFile() const { return projectFile_; }
+    void setFiles(const QStringList files, const QString &projectFile)
+    {
+        files_ = files;
+        projectFile_ = projectFile;
+    }
     void setImages(const QStringList images) { images_ = images; }
     void appendFile(QString &file) { files_.append(file); }
     void appendImage(QString &image) { images_.append(image); }
 
 private:
     QString imageFileName_;
+    QString projectFile_;
     QStringList files_;
     QStringList images_;
 };