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

Merge remote-tracking branch 'origin/11.0' into qds/dev

Browse Source 
Conflicts:
 src/plugins/qmldesigner/CMakeLists.txt
 src/plugins/qmldesignerbase/CMakeLists.txt
 src/plugins/qmlprojectmanager/CMakeLists.txt
Change-Id: If706ae3fe7a7d0e17036ce6285bec772d1f6127d
This commit is contained in:
Tim Jenssen
2023-07-04 17:31:14 +02:00
parent c572855b95 1487f1a0c0
commit 48230d63b8
191 changed files with 68408 additions and 55791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/CMakeLists.txt
View File

@@ -25,7 +25,7 @@ add_qtc_plugin(QmlProjectManager
)
extend_qtc_plugin(QmlProjectManager
CONDITION (NOT DISABLE_COMPILE_WARNING_AS_ERROR) AND ($<CONFIG:Debug> OR WITH_TESTS)
CONDITION ENABLE_COMPILE_WARNING_AS_ERROR
PROPERTIES COMPILE_WARNING_AS_ERROR ON
)

12
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -207,15 +207,15 @@ FilePath QmlProjectRunConfiguration::qmlRuntimeFilePath() const
// We might not have a full Qt version for building, but the device
// might know what is good for running.
if (IDevice::ConstPtr dev = DeviceKitAspect::device(kit)) {
IDevice::ConstPtr dev = DeviceKitAspect::device(kit);
if (dev) {
const FilePath qmlRuntime = dev->qmlRunCommand();
if (!qmlRuntime.isEmpty())
return qmlRuntime;
}
// The Qt version might know. That's the "build" Qt version,
// i.e. not necessarily something the device can use, but the
// device had its chance above.
// The Qt version might know, but we need to make sure
// that the device can reach it.
if (QtVersion *version = QtKitAspect::qtVersion(kit)) {
// look for puppet as qmlruntime only in QtStudio Qt versions
if (version->features().contains("QtStudio") &&
@@ -229,13 +229,13 @@ FilePath QmlProjectRunConfiguration::qmlRuntimeFilePath() const
}
}
const FilePath qmlRuntime = version->qmlRuntimeFilePath();
if (!qmlRuntime.isEmpty())
if (!qmlRuntime.isEmpty() && (!dev || dev->ensureReachable(qmlRuntime)))
return qmlRuntime;
}
// If not given explicitly by run device, nor Qt, try to pick
// it from $PATH on the run device.
return "qml";
return dev ? dev->filePath("qml").searchInPath() : "qml";
}
void QmlProjectRunConfiguration::createQtVersionAspect()