feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into 4.11

Browse Source 
Change-Id: Ia99614078444b3b7e1e8473b6d2708f21e89e315
This commit is contained in:
Eike Ziller
2019-10-02 07:37:13 +02:00
parent ac014e3875 7debb513e2
commit 2c45abef4b
35 changed files with 292 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsprojectimporter.cpp
View File

@@ -186,7 +186,7 @@ bool QbsProjectImporter::matchKit(void *directoryData, const Kit *k) const
if (!bgData->qtBinPath.isEmpty()) {
if (!qtVersion)
return false;
if (bgData->qtBinPath != qtVersion->binPath())
if (bgData->qtBinPath != qtVersion->hostBinPath())
return false;
}
if (bgData->sysroot != SysRootKitAspect::sysRoot(k))