diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 14 | ||||
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.h | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 3f5c6e3ebd..94e6237b1d 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -176,7 +176,7 @@ FilePath QmlProjectRunConfiguration::qmlScenePath() const if (deviceType == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { // If not given explicitly by Qt Version, try to pick it from $PATH. const bool isDesktop = version->type() == QtSupport::Constants::DESKTOPQT; - return FilePath::fromString(isDesktop ? version->qmlsceneCommand() : QString("qmlscene")); + return isDesktop ? version->qmlsceneCommand() : FilePath::fromString("qmlscene"); } IDevice::ConstPtr dev = DeviceKitAspect::device(kit); diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index d40faa5e6d..36b5cf52dd 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -240,7 +240,7 @@ public: QString m_designerCommand; QString m_linguistCommand; QString m_qscxmlcCommand; - QString m_qmlsceneCommand; + FilePath m_qmlsceneCommand; QString m_qmlplugindumpCommand; MacroExpanderWrapper m_expander; @@ -1019,18 +1019,16 @@ QString BaseQtVersion::qscxmlcCommand() const return d->m_qscxmlcCommand; } -QString BaseQtVersion::qmlsceneCommand() const +FilePath BaseQtVersion::qmlsceneCommand() const { if (!isValid()) - return QString(); + return {}; - if (!d->m_qmlsceneCommand.isNull()) + if (!d->m_qmlsceneCommand.isEmpty()) return d->m_qmlsceneCommand; - const QString path - = binPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlscene")).toString(); - - d->m_qmlsceneCommand = QFileInfo(path).isFile() ? path : QString(); + const FilePath path = binPath() / HostOsInfo::withExecutableSuffix("qmlscene"); + d->m_qmlsceneCommand = path.isExecutableFile() ? path : FilePath(); return d->m_qmlsceneCommand; } diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 65cf7669d6..c4592c20ab 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -137,7 +137,7 @@ public: QString designerCommand() const; QString linguistCommand() const; QString qscxmlcCommand() const; - QString qmlsceneCommand() const; + Utils::FilePath qmlsceneCommand() const; QString qmlplugindumpCommand() const; QString qtVersionString() const; |