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

QmlDesigner: Fix spelling in PuppetCreator

Browse Source 
Change-Id: I0acca5762d8263292ad0bd9fdac41fc268049e35
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-07-15 18:29:00 +02:00
committed by Tim Jenssen
parent 35ee31a062
commit 026a50648b
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
View File

@@ -126,9 +126,9 @@ QProcess *PuppetCreator::createPuppetProcess(PuppetCreator::QmlPuppetVersion pup
{ {
QString puppetPath; QString puppetPath;
if (puppetVersion == Qml1Puppet) if (puppetVersion == Qml1Puppet)
puppetPath = qmlpuppetPath(m_availablePuppetType); puppetPath = qmlPuppetPath(m_availablePuppetType);
else else
puppetPath = qml2puppetPath(m_availablePuppetType); puppetPath = qml2PuppetPath(m_availablePuppetType);
return puppetProcess(puppetPath, return puppetProcess(puppetPath,
puppetMode, puppetMode,
@@ -190,7 +190,7 @@ bool PuppetCreator::build(const QString &qmlPuppetProjectFilePath) const
QStringList qmakeArguments; QStringList qmakeArguments;
qmakeArguments.append(QStringLiteral("-r")); qmakeArguments.append(QStringLiteral("-r"));
qmakeArguments.append(QStringLiteral("-after")); qmakeArguments.append(QStringLiteral("-after"));
qmakeArguments.append(QStringLiteral("DESTDIR=") + qmlpuppetDirectory(UserSpacePuppet)); qmakeArguments.append(QStringLiteral("DESTDIR=") + qmlPuppetDirectory(UserSpacePuppet));
#ifndef QT_DEBUG #ifndef QT_DEBUG
qmakeArguments.append(QStringLiteral("CONFIG+=release")); qmakeArguments.append(QStringLiteral("CONFIG+=release"));
#endif #endif
@@ -248,7 +248,7 @@ void PuppetCreator::createQml1PuppetExecutableIfMissing()
} else { } else {
if (m_kit->isValid()) { if (m_kit->isValid()) {
bool buildSucceeded = build(qmlpuppetProjectFile()); bool buildSucceeded = build(qmlPuppetProjectFile());
if (buildSucceeded) if (buildSucceeded)
m_availablePuppetType = UserSpacePuppet; m_availablePuppetType = UserSpacePuppet;
else else
@@ -270,11 +270,11 @@ void PuppetCreator::createQml2PuppetExecutableIfMissing()
if (m_qml2PuppetForKitPuppetHash.contains(m_kit->id())) { if (m_qml2PuppetForKitPuppetHash.contains(m_kit->id())) {
m_availablePuppetType = m_qml2PuppetForKitPuppetHash.value(m_kit->id()); m_availablePuppetType = m_qml2PuppetForKitPuppetHash.value(m_kit->id());
} else if (checkQml2puppetIsReady()) { } else if (checkQml2PuppetIsReady()) {
m_availablePuppetType = UserSpacePuppet; m_availablePuppetType = UserSpacePuppet;
} else { } else {
if (m_kit->isValid()) { if (m_kit->isValid()) {
bool buildSucceeded = build(qml2puppetProjectFile()); bool buildSucceeded = build(qml2PuppetProjectFile());
if (buildSucceeded) if (buildSucceeded)
m_availablePuppetType = UserSpacePuppet; m_availablePuppetType = UserSpacePuppet;
else else
@@ -290,7 +290,7 @@ void PuppetCreator::createQml2PuppetExecutableIfMissing()
} }
} }
QString PuppetCreator::qmlpuppetDirectory(PuppetType puppetType) const QString PuppetCreator::qmlPuppetDirectory(PuppetType puppetType) const
{ {
if (puppetType == UserSpacePuppet) if (puppetType == UserSpacePuppet)
@@ -300,22 +300,22 @@ QString PuppetCreator::qmlpuppetDirectory(PuppetType puppetType) const
+ qtHash(); + qtHash();
return qmlpuppetFallbackDirectory(); return qmlPuppetFallbackDirectory();
} }
QString PuppetCreator::qmlpuppetFallbackDirectory() const QString PuppetCreator::qmlPuppetFallbackDirectory() const
{ {
return QCoreApplication::applicationDirPath(); return QCoreApplication::applicationDirPath();
} }
QString PuppetCreator::qml2puppetPath(PuppetType puppetType) const QString PuppetCreator::qml2PuppetPath(PuppetType puppetType) const
{ {
return qmlpuppetDirectory(puppetType) + QStringLiteral("/qml2puppet") + QStringLiteral(QTC_HOST_EXE_SUFFIX); return qmlPuppetDirectory(puppetType) + QStringLiteral("/qml2puppet") + QStringLiteral(QTC_HOST_EXE_SUFFIX);
} }
QString PuppetCreator::qmlpuppetPath(PuppetType puppetType) const QString PuppetCreator::qmlPuppetPath(PuppetType puppetType) const
{ {
return qmlpuppetDirectory(puppetType) + QStringLiteral("/qmlpuppet") + QStringLiteral(QTC_HOST_EXE_SUFFIX); return qmlPuppetDirectory(puppetType) + QStringLiteral("/qmlpuppet") + QStringLiteral(QTC_HOST_EXE_SUFFIX);
} }
QProcessEnvironment PuppetCreator::processEnvironment() const QProcessEnvironment PuppetCreator::processEnvironment() const
@@ -394,12 +394,12 @@ QString PuppetCreator::puppetSourceDirectoryPath()
return Core::ICore::resourcePath() + QStringLiteral("/qml/qmlpuppet"); return Core::ICore::resourcePath() + QStringLiteral("/qml/qmlpuppet");
} }
QString PuppetCreator::qml2puppetProjectFile() QString PuppetCreator::qml2PuppetProjectFile()
{ {
return puppetSourceDirectoryPath() + QStringLiteral("/qml2puppet/qml2puppet.pro"); return puppetSourceDirectoryPath() + QStringLiteral("/qml2puppet/qml2puppet.pro");
} }
QString PuppetCreator::qmlpuppetProjectFile() QString PuppetCreator::qmlPuppetProjectFile()
{ {
return puppetSourceDirectoryPath() + QStringLiteral("/qmlpuppet/qmlpuppet.pro"); return puppetSourceDirectoryPath() + QStringLiteral("/qmlpuppet/qmlpuppet.pro");
} }
@@ -416,14 +416,14 @@ bool PuppetCreator::checkPuppetIsReady(const QString &puppetPath) const
return false; return false;
} }
bool PuppetCreator::checkQml2puppetIsReady() const bool PuppetCreator::checkQml2PuppetIsReady() const
{ {
return checkPuppetIsReady(qml2puppetPath(UserSpacePuppet)); return checkPuppetIsReady(qml2PuppetPath(UserSpacePuppet));
} }
bool PuppetCreator::checkQmlpuppetIsReady() const bool PuppetCreator::checkQmlpuppetIsReady() const
{ {
return checkPuppetIsReady(qmlpuppetPath(UserSpacePuppet)); return checkPuppetIsReady(qmlPuppetPath(UserSpacePuppet));
} }
static bool nonEarlyQt5Version(const QtSupport::QtVersionNumber &currentQtVersionNumber) static bool nonEarlyQt5Version(const QtSupport::QtVersionNumber &currentQtVersionNumber)

14
src/plugins/qmldesigner/designercore/instances/puppetcreator.h
View File

@@ -75,21 +75,21 @@ protected:
void createQml1PuppetExecutableIfMissing(); void createQml1PuppetExecutableIfMissing();
void createQml2PuppetExecutableIfMissing(); void createQml2PuppetExecutableIfMissing();
QString qmlpuppetDirectory(PuppetType puppetPathType) const; QString qmlPuppetDirectory(PuppetType puppetPathType) const;
QString qmlpuppetFallbackDirectory() const; QString qmlPuppetFallbackDirectory() const;
QString qml2puppetPath(PuppetType puppetType) const; QString qml2PuppetPath(PuppetType puppetType) const;
QString qmlpuppetPath(PuppetType puppetPathType) const; QString qmlPuppetPath(PuppetType puppetPathType) const;
bool startBuildProcess(const QString &buildDirectoryPath, bool startBuildProcess(const QString &buildDirectoryPath,
const QString &command, const QString &command,
const QStringList &processArguments = QStringList(), const QStringList &processArguments = QStringList(),
PuppetBuildProgressDialog *progressDialog = 0) const; PuppetBuildProgressDialog *progressDialog = 0) const;
static QString puppetSourceDirectoryPath(); static QString puppetSourceDirectoryPath();
static QString qml2puppetProjectFile(); static QString qml2PuppetProjectFile();
static QString qmlpuppetProjectFile(); static QString qmlPuppetProjectFile();
bool checkPuppetIsReady(const QString &puppetPath) const; bool checkPuppetIsReady(const QString &puppetPath) const;
bool checkQml2puppetIsReady() const; bool checkQml2PuppetIsReady() const;
bool checkQmlpuppetIsReady() const; bool checkQmlpuppetIsReady() const;
bool qtIsSupported() const; bool qtIsSupported() const;
static bool checkPuppetVersion(const QString &qmlPuppetPath); static bool checkPuppetVersion(const QString &qmlPuppetPath);