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

QtSupport: Fix host specific handling

Browse Source 
When handling qmake on a device we need to take the
device's host os into account instead of ours.

Change-Id: Ice5d11dc5c623be702d1e54d6b3d0c635ff57c7a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-07-23 11:23:05 +02:00
parent 5d5969b46c
commit 67b082b51b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1901,7 +1901,8 @@ FilePath BaseQtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProStri
// qDebug() << "default mkspec is located at" << mkspecFullPath; // qDebug() << "default mkspec is located at" << mkspecFullPath;
if (HostOsInfo::isWindowsHost()) { OsType osInfo = mkspecFullPath.osType();
if (osInfo == OsTypeWindows) {
if (!qt5) { if (!qt5) {
QFile f2(mkspecFullPath.toString() + "/qmake.conf"); QFile f2(mkspecFullPath.toString() + "/qmake.conf");
if (f2.exists() && f2.open(QIODevice::ReadOnly)) { if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
@@ -1931,7 +1932,7 @@ FilePath BaseQtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProStri
} }
} }
} else { } else {
if (HostOsInfo::isMacHost()) { if (osInfo == OsTypeMac) {
QFile f2(mkspecFullPath.toString() + "/qmake.conf"); QFile f2(mkspecFullPath.toString() + "/qmake.conf");
if (f2.exists() && f2.open(QIODevice::ReadOnly)) { if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
while (!f2.atEnd()) { while (!f2.atEnd()) {