diff options
Diffstat (limited to 'src/plugins/qmldesigner/designercore/instances')
3 files changed, 23 insertions, 14 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index 609db1fe952..c0723bf751b 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -143,17 +143,17 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV const int second = 1000; const int waitConstant = 8 * second; if (m_qmlPuppetEditorProcess->waitForStarted(waitConstant)) { - connect(m_qmlPuppetEditorProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + connect(m_qmlPuppetEditorProcess.data(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), m_qmlPuppetEditorProcess.data(), &QProcess::deleteLater); qCInfo(instanceViewBenchmark) << "puppets started:" << m_benchmarkTimer.elapsed(); if (runModus == NormalModus) { m_qmlPuppetPreviewProcess->waitForStarted(waitConstant / 2); - connect(m_qmlPuppetPreviewProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + connect(m_qmlPuppetPreviewProcess.data(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), m_qmlPuppetPreviewProcess.data(), &QProcess::deleteLater); m_qmlPuppetRenderProcess->waitForStarted(waitConstant / 2); - connect(m_qmlPuppetRenderProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + connect(m_qmlPuppetRenderProcess.data(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), m_qmlPuppetRenderProcess.data(), &QProcess::deleteLater); } diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h index d0309aacaae..60565261d27 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h @@ -29,8 +29,8 @@ #include <QPointer> #include <QProcess> +#include <QElapsedTimer> #include <QFile> -#include <QTime> #include <QTimer> QT_BEGIN_NAMESPACE @@ -127,7 +127,7 @@ private: quint32 m_thirdLastReadCommandCounter = 0; RunModus m_runModus; int m_synchronizeId = -1; - QTime m_benchmarkTimer; + QElapsedTimer m_benchmarkTimer; bool m_destructing = false; }; diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 8ab932e8b10..0959dd4a9ed 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -90,7 +90,7 @@ QHash<Core::Id, PuppetCreator::PuppetType> PuppetCreator::m_qml2PuppetForKitPupp QByteArray PuppetCreator::qtHash() const { - QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit); + QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(m_kit); if (currentQtVersion) { return QCryptographicHash::hash(currentQtVersion->qmakeProperty("QT_INSTALL_DATA").toUtf8(), QCryptographicHash::Sha1) @@ -102,7 +102,7 @@ QByteArray PuppetCreator::qtHash() const QDateTime PuppetCreator::qtLastModified() const { - QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit); + QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(m_kit); if (currentQtVersion) return QFileInfo(currentQtVersion->qmakeProperty("QT_INSTALL_LIBS")).lastModified(); @@ -153,7 +153,7 @@ QString PuppetCreator::getStyleConfigFileName() const { #ifndef QMLDESIGNER_TEST if (m_currentProject) { - for (const Utils::FileName &fileName : m_currentProject->files(ProjectExplorer::Project::SourceFiles)) { + for (const Utils::FilePath &fileName : m_currentProject->files(ProjectExplorer::Project::SourceFiles)) { if (fileName.fileName() == "qtquickcontrols2.conf") return fileName.toString(); } @@ -419,10 +419,10 @@ QProcessEnvironment PuppetCreator::processEnvironment() const Utils::Environment environment = Utils::Environment::systemEnvironment(); if (!useOnlyFallbackPuppet()) m_kit->addToEnvironment(environment); - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(m_kit); + const QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(m_kit); if (QTC_GUARD(qt)) { // Kits without a Qt version should not have a puppet! // Update PATH to include QT_HOST_BINS - const Utils::FileName qtBinPath = qt->binPath(); + const Utils::FilePath qtBinPath = qt->binPath(); environment.prependOrSetPath(qtBinPath.toString()); } environment.set("QML_BAD_GUI_RENDER_LOOP", "true"); @@ -472,10 +472,15 @@ QProcessEnvironment PuppetCreator::processEnvironment() const if (!styleConfigFileName.isEmpty()) environment.appendOrSet("QT_QUICK_CONTROLS_CONF", styleConfigFileName); + QStringList customFileSelectors; + if (m_currentProject && m_currentProject->activeTarget()) { QStringList designerImports = m_currentProject->activeTarget() ->additionalData("QmlDesignerImportPath").toStringList(); importPaths.append(designerImports); + + customFileSelectors = m_currentProject->activeTarget() + ->additionalData("CustomFileSelectorsData").toStringList(); } if (m_availablePuppetType == FallbackPuppet) @@ -483,10 +488,14 @@ QProcessEnvironment PuppetCreator::processEnvironment() const environment.appendOrSet("QML2_IMPORT_PATH", importPaths.join(pathSep), pathSep); + if (!customFileSelectors.isEmpty()) + environment.appendOrSet("QML_FILE_SELECTORS", customFileSelectors.join(","), pathSep); + qCInfo(puppetStart) << Q_FUNC_INFO; qCInfo(puppetStart) << "Puppet qrc mapping" << m_qrcMapping; qCInfo(puppetStart) << "Puppet import paths:" << importPaths; qCInfo(puppetStart) << "Puppet environment:" << environment.toStringList(); + qCInfo(puppetStart) << "Puppet selectors:" << customFileSelectors; return environment.toProcessEnvironment(); } @@ -497,18 +506,18 @@ QString PuppetCreator::buildCommand() const m_kit->addToEnvironment(environment); ProjectExplorer::ToolChain *toolChain - = ProjectExplorer::ToolChainKitInformation::toolChain(m_kit, + = ProjectExplorer::ToolChainKitAspect::toolChain(m_kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID); if (toolChain) - return toolChain->makeCommand(environment); + return toolChain->makeCommand(environment).toString(); return QString(); } QString PuppetCreator::qmakeCommand() const { - QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit); + QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(m_kit); if (currentQtVersion) return currentQtVersion->qmakeCommand().toString(); @@ -595,7 +604,7 @@ static bool nonEarlyQt5Version(const QtSupport::QtVersionNumber ¤tQtVersio bool PuppetCreator::qtIsSupported() const { - QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitInformation::qtVersion(m_kit); + QtSupport::BaseQtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(m_kit); return currentQtVersion && currentQtVersion->isValid() |