Commit 8b6dfab9 authored by Kai Koehne's avatar Kai Koehne

QmlProject: Whitespace

parent f635e882
...@@ -69,7 +69,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent) ...@@ -69,7 +69,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent)
{ {
ctor(); ctor();
updateQtVersions(); updateQtVersions();
} }
QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent, QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent,
QmlProjectRunConfiguration *source) : QmlProjectRunConfiguration *source) :
...@@ -195,7 +195,7 @@ QString QmlProjectRunConfiguration::canonicalCapsPath(const QString &fileName) ...@@ -195,7 +195,7 @@ QString QmlProjectRunConfiguration::canonicalCapsPath(const QString &fileName)
if (!path.isEmpty()) if (!path.isEmpty())
canonicalPath = path; canonicalPath = path;
#endif #endif
return canonicalPath; return canonicalPath;
} }
...@@ -335,14 +335,14 @@ void QmlProjectRunConfiguration::updateEnabled() ...@@ -335,14 +335,14 @@ void QmlProjectRunConfiguration::updateEnabled()
qmlFileFound = true; qmlFileFound = true;
} }
if (!editor if (!editor
|| db->findByFile(mainScript()).type() == QLatin1String("application/x-qmlproject")) { || db->findByFile(mainScript()).type() == QLatin1String("application/x-qmlproject")) {
// find a qml file with lowercase filename. This is slow, but only done // find a qml file with lowercase filename. This is slow, but only done
// in initialization/other border cases. // in initialization/other border cases.
foreach(const QString &filename, m_projectTarget->qmlProject()->files()) { foreach(const QString &filename, m_projectTarget->qmlProject()->files()) {
const QFileInfo fi(filename); const QFileInfo fi(filename);
if (!filename.isEmpty() && fi.baseName()[0].isLower() if (!filename.isEmpty() && fi.baseName()[0].isLower()
&& db->findByFile(fi).type() == QLatin1String("application/x-qml")) && db->findByFile(fi).type() == QLatin1String("application/x-qml"))
{ {
m_currentFileFilename = filename; m_currentFileFilename = filename;
qmlFileFound = true; qmlFileFound = true;
...@@ -356,7 +356,7 @@ void QmlProjectRunConfiguration::updateEnabled() ...@@ -356,7 +356,7 @@ void QmlProjectRunConfiguration::updateEnabled()
} }
bool newValue = (QFileInfo(viewerPath()).exists() bool newValue = (QFileInfo(viewerPath()).exists()
|| QFileInfo(observerPath()).exists()) && qmlFileFound; || QFileInfo(observerPath()).exists()) && qmlFileFound;
// Always emit change signal to force reevaluation of run/debug buttons // Always emit change signal to force reevaluation of run/debug buttons
...@@ -420,5 +420,4 @@ QList<Utils::EnvironmentItem> QmlProjectRunConfiguration::userEnvironmentChanges ...@@ -420,5 +420,4 @@ QList<Utils::EnvironmentItem> QmlProjectRunConfiguration::userEnvironmentChanges
return m_userEnvironmentChanges; return m_userEnvironmentChanges;
} }
} // namespace QmlProjectManager } // namespace QmlProjectManager
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment