QmlProject: Inline QmlProjectRunConfiguration::qtVersion into caller

Change-Id: I0af467d60ac4eaf55d825dbe0df83108c0f5db36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-12-20 19:11:10 +01:00
parent fbf1a19628
commit 915d5cf259
2 changed files with 3 additions and 9 deletions

View File

@@ -45,6 +45,8 @@
using namespace Core; using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace QtSupport;
using namespace QmlProjectManager::Internal; using namespace QmlProjectManager::Internal;
namespace QmlProjectManager { namespace QmlProjectManager {
@@ -93,7 +95,7 @@ QString QmlProjectRunConfiguration::disabledReason() const
QString QmlProjectRunConfiguration::executable() const QString QmlProjectRunConfiguration::executable() const
{ {
QtSupport::BaseQtVersion *version = qtVersion(); BaseQtVersion *version = QtKitInformation::qtVersion(target()->kit());
if (!version) if (!version)
return QString(); return QString();
@@ -127,12 +129,6 @@ QString QmlProjectRunConfiguration::canonicalCapsPath(const QString &fileName)
return Utils::FileUtils::normalizePathName(QFileInfo(fileName).canonicalFilePath()); return Utils::FileUtils::normalizePathName(QFileInfo(fileName).canonicalFilePath());
} }
QtSupport::BaseQtVersion *QmlProjectRunConfiguration::qtVersion() const
{
return QtSupport::QtKitInformation::qtVersion(target()->kit());
}
QWidget *QmlProjectRunConfiguration::createConfigurationWidget() QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
{ {
return new QmlProjectRunConfigurationWidget(this); return new QmlProjectRunConfigurationWidget(this);

View File

@@ -50,8 +50,6 @@ public:
ProjectExplorer::Runnable runnable() const override; ProjectExplorer::Runnable runnable() const override;
QtSupport::BaseQtVersion *qtVersion() const;
enum MainScriptSource { enum MainScriptSource {
FileInEditor, FileInEditor,
FileInProjectFile, FileInProjectFile,