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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Change-Id: I3bab4e31bc5993c59c7025ebde0846bf6c75810e
This commit is contained in:
Eike Ziller
2021-11-19 10:44:15 +01:00
parent d06183d9cc b569041709
commit eba4115b82
82 changed files with 706 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -44,6 +44,7 @@
#include <extensionsystem/pluginspec.h>
#include <utils/infobar.h>
#include <utils/qtcprocess.h>
#include <QMessageBox>
#include <QPushButton>
@@ -91,13 +92,14 @@ QmlProjectPlugin::~QmlProjectPlugin()
void QmlProjectPlugin::openQDS(const Utils::FilePath &fileName)
{
const QString &qdsPath = QmlProjectPlugin::qdsInstallationEntry();
const Utils::FilePath &qdsPath = QmlProjectPlugin::qdsInstallationEntry();
bool qdsStarted = false;
//-a and -client arguments help to append project to open design studio application
if (Utils::HostOsInfo::isMacHost())
qdsStarted = QProcess::startDetached("/usr/bin/open", {"-a", qdsPath, fileName.toString()});
qdsStarted = Utils::QtcProcess::startDetached(
{"/usr/bin/open", {"-a", qdsPath.path(), fileName.toString()}});
else
qdsStarted = QProcess::startDetached(qdsPath, {"-client", fileName.toString()});
qdsStarted = Utils::QtcProcess::startDetached({qdsPath, {"-client", fileName.toString()}});
if (!qdsStarted) {
QMessageBox::warning(Core::ICore::dialogParent(),
@@ -106,17 +108,17 @@ void QmlProjectPlugin::openQDS(const Utils::FilePath &fileName)
}
}
QString QmlProjectPlugin::qdsInstallationEntry()
Utils::FilePath QmlProjectPlugin::qdsInstallationEntry()
{
QSettings *settings = Core::ICore::settings();
const QString qdsInstallationEntry = "QML/Designer/DesignStudioInstallation"; //set in installer
return settings->value(qdsInstallationEntry).toString();
return Utils::FilePath::fromUserInput(settings->value(qdsInstallationEntry).toString());
}
bool QmlProjectPlugin::qdsInstallationExists()
{
return Utils::FilePath::fromString(qdsInstallationEntry()).exists();
return qdsInstallationEntry().exists();
}
Utils::FilePath findQmlProject(const Utils::FilePath &folder)

2
src/plugins/qmlprojectmanager/qmlprojectplugin.h
View File

@@ -41,7 +41,7 @@ public:
~QmlProjectPlugin() final;
static void openQDS(const Utils::FilePath &fileName);
static QString qdsInstallationEntry();
static Utils::FilePath qdsInstallationEntry();
static bool qdsInstallationExists();
private: