diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-30 11:27:30 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-30 11:29:26 +0100 |
| commit | b4ac33c7528b6d3de71a071a05bb7575f3eb951d (patch) | |
| tree | 1cd8101f7ef4da9fa0b5f5b1d6863b6c63b97062 /src/plugins/qmlprojectmanager/qmlapp.cpp | |
| parent | 86161c890037d1398ab0bce9ae2826a3cc5064cc (diff) | |
| download | qt-creator-b4ac33c7528b6d3de71a071a05bb7575f3eb951d.tar.gz | |
Compile fix in QmlProjectManager.
Change-Id: Icd180542d2b8393562d05ce25dd70b8f48942220
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlapp.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlapp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlapp.cpp b/src/plugins/qmlprojectmanager/qmlapp.cpp index 9e3f36a2b9..143aaa12cd 100644 --- a/src/plugins/qmlprojectmanager/qmlapp.cpp +++ b/src/plugins/qmlprojectmanager/qmlapp.cpp @@ -208,7 +208,7 @@ QList<TemplateInfo> QmlApp::templateInfos() const QString templatePath = templateRootDirectory() + templateName; QFile xmlFile(templatePath + QLatin1String("/template.xml")); 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; } TemplateInfo info; @@ -271,7 +271,7 @@ QString QmlApp::readAndAdaptTemplateFile(const QString &filePath, bool &ok) cons replaceXWithYString.replace(QRegExp(QLatin1String(" -->$")), QString()); const QStringList replaceXWithY = replaceXWithYString.split(markerWith); 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); ok = false; return QString(); @@ -279,7 +279,7 @@ QString QmlApp::readAndAdaptTemplateFile(const QString &filePath, bool &ok) cons const QString replaceWhat = replaceXWithY.at(0).trimmed(); const QString replaceWith = replaceXWithY.at(1).trimmed(); 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); ok = false; 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. lineNr++; 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); ok = false; return QString(); |