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

Qnx: Use new RunConfiguration::setRunnableModifier

Browse Source 
Simplifies code.

Change-Id: I8d1e2e93ae1142b40fef0158de3301aead54fc7b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-04-13 09:49:35 +02:00
parent e03af19edc
commit 6ceb2244d8
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/qnx/qnxrunconfiguration.cpp
View File

@@ -64,7 +64,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Utils::Id id)
addAspect<TerminalAspect>(); addAspect<TerminalAspect>();
addAspect<RemoteLinuxEnvironmentAspect>(target); addAspect<RemoteLinuxEnvironmentAspect>(target);
auto libAspect = addAspect<QtLibPathAspect>(); auto libAspect = addAspect<StringAspect>();
libAspect->setSettingsKey("Qt4ProjectManager.QnxRunConfiguration.QtLibPath"); libAspect->setSettingsKey("Qt4ProjectManager.QnxRunConfiguration.QtLibPath");
libAspect->setLabelText(tr("Path to Qt libraries on device")); libAspect->setLabelText(tr("Path to Qt libraries on device"));
libAspect->setDisplayStyle(StringAspect::LineEditDisplay); libAspect->setDisplayStyle(StringAspect::LineEditDisplay);
@@ -78,21 +78,18 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Utils::Id id)
symbolsAspect->setFilePath(localExecutable); symbolsAspect->setFilePath(localExecutable);
}); });
connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update); setRunnableModifier([libAspect](Runnable &r) {
} QString libPath = libAspect->value();
if (!libPath.isEmpty()) {
r.environment.appendOrSet("LD_LIBRARY_PATH", libPath + "/lib:$LD_LIBRARY_PATH");
r.environment.appendOrSet("QML_IMPORT_PATH", libPath + "/imports:$QML_IMPORT_PATH");
r.environment.appendOrSet("QML2_IMPORT_PATH", libPath + "/qml:$QML2_IMPORT_PATH");
r.environment.appendOrSet("QT_PLUGIN_PATH", libPath + "/plugins:$QT_PLUGIN_PATH");
r.environment.set("QT_QPA_FONTDIR", libPath + "/lib/fonts");
}
});
Runnable QnxRunConfiguration::runnable() const connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
{
Runnable r = RunConfiguration::runnable();
QString libPath = aspect<QtLibPathAspect>()->value();
if (!libPath.isEmpty()) {
r.environment.appendOrSet("LD_LIBRARY_PATH", libPath + "/lib:$LD_LIBRARY_PATH");
r.environment.appendOrSet("QML_IMPORT_PATH", libPath + "/imports:$QML_IMPORT_PATH");
r.environment.appendOrSet("QML2_IMPORT_PATH", libPath + "/qml:$QML2_IMPORT_PATH");
r.environment.appendOrSet("QT_PLUGIN_PATH", libPath + "/plugins:$QT_PLUGIN_PATH");
r.environment.set("QT_QPA_FONTDIR", libPath + "/lib/fonts");
}
return r;
} }
// QnxRunConfigurationFactory // QnxRunConfigurationFactory

11
src/plugins/qnx/qnxrunconfiguration.h
View File

@@ -31,23 +31,12 @@
namespace Qnx { namespace Qnx {
namespace Internal { namespace Internal {
class QtLibPathAspect : public Utils::StringAspect
{
Q_OBJECT
public:
QtLibPathAspect() = default;
};
class QnxRunConfiguration final : public ProjectExplorer::RunConfiguration class QnxRunConfiguration final : public ProjectExplorer::RunConfiguration
{ {
Q_OBJECT Q_OBJECT
public: public:
QnxRunConfiguration(ProjectExplorer::Target *target, Utils::Id id); QnxRunConfiguration(ProjectExplorer::Target *target, Utils::Id id);
private:
ProjectExplorer::Runnable runnable() const override;
}; };
class QnxRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory class QnxRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory