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

Compile fix in QmlProjectManager.

Browse Source 
Change-Id: Icd180542d2b8393562d05ce25dd70b8f48942220
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Friedemann Kleint
2013-01-30 11:27:30 +01:00
parent 86161c8900
commit b4ac33c752
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlprojectmanager/qmlapp.cpp
View File

@@ -208,7 +208,7 @@ QList<TemplateInfo> QmlApp::templateInfos()
const QString templatePath = templateRootDirectory() + templateName; const QString templatePath = templateRootDirectory() + templateName;
QFile xmlFile(templatePath + QLatin1String("/template.xml")); QFile xmlFile(templatePath + QLatin1String("/template.xml"));
if (!xmlFile.open(QIODevice::ReadOnly)) { if (!xmlFile.open(QIODevice::ReadOnly)) {
qWarning().nospace() << QString::fromLatin1("Cannot open %1").arg(QDir::toNativeSeparators(QFileInfo(xmlFile.fileName()).absoluteFilePath()); qWarning().nospace() << QString::fromLatin1("Cannot open %1").arg(QDir::toNativeSeparators(QFileInfo(xmlFile.fileName()).absoluteFilePath()));
continue; continue;
} }
TemplateInfo info; TemplateInfo info;
@@ -271,7 +271,7 @@ QString QmlApp::readAndAdaptTemplateFile(const QString &filePath, bool &ok) cons
replaceXWithYString.replace(QRegExp(QLatin1String(" -->$")), QString()); replaceXWithYString.replace(QRegExp(QLatin1String(" -->$")), QString());
const QStringList replaceXWithY = replaceXWithYString.split(markerWith); const QStringList replaceXWithY = replaceXWithYString.split(markerWith);
if (replaceXWithY.count() != 2) { if (replaceXWithY.count() != 2) {
qWarning().nospace() << QString::fromLatin1("QmlApplicationWizard", "Error in %1:%2. Invalid %3 options.") qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Invalid %3 options.")
.arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(markerQtcReplace); .arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(markerQtcReplace);
ok = false; ok = false;
return QString(); return QString();
@@ -279,7 +279,7 @@ QString QmlApp::readAndAdaptTemplateFile(const QString &filePath, bool &ok) cons
const QString replaceWhat = replaceXWithY.at(0).trimmed(); const QString replaceWhat = replaceXWithY.at(0).trimmed();
const QString replaceWith = replaceXWithY.at(1).trimmed(); const QString replaceWith = replaceXWithY.at(1).trimmed();
if (!m_replacementVariables.contains(replaceWith)) { if (!m_replacementVariables.contains(replaceWith)) {
qWarning().nospace() << QString::fromLatin1("QmlApplicationWizard", "Error in %1:%2. Unknown %3 option '%4'.") qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Unknown %3 option '%4'.")
.arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(markerQtcReplace).arg(replaceWith); .arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(markerQtcReplace).arg(replaceWith);
ok = false; ok = false;
return QString(); return QString();
@@ -287,7 +287,7 @@ QString QmlApp::readAndAdaptTemplateFile(const QString &filePath, bool &ok) cons
line = tsIn.readLine(); // Following line which is to be patched. line = tsIn.readLine(); // Following line which is to be patched.
lineNr++; lineNr++;
if (line.indexOf(replaceWhat) < 0) { if (line.indexOf(replaceWhat) < 0) {
qWarning().nospace() << QString::fromLatin1("QmlApplicationWizard", "Error in %1:%2. Replacement '%3' not found.") qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Replacement '%3' not found.")
.arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(replaceWhat); .arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(replaceWhat);
ok = false; ok = false;
return QString(); return QString();