Merge remote-tracking branch 'origin/4.10'

Change-Id: I88a6704fb8d723a3cbdfb1a2d9c84741f30d4da6
This commit is contained in:
Eike Ziller
2019-07-22 09:34:47 +02:00
28 changed files with 304 additions and 107 deletions

View File

@@ -69,7 +69,7 @@ private:
QStringList processEntries(const QStringList &paths,
QHash<QString, QString> *map = nullptr) const;
static QString findCommonSourceRoot(const QStringList &list);
Utils::FilePath findCommonSourceRoot();
void refreshCppCodeModel();
void updateDeploymentData();
void activeTargetWasChanged();