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

More build fixes for OS X

Browse Source 
Change-Id: I55a8d4e50d77ff1f11f471931e5ad959f2e946c6
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Eike Ziller
2013-10-02 14:54:45 +02:00
parent 2ef111fc8f
commit 25f7952f56
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qnx/cascadesimport/bardescriptorconverter.cpp
View File

@@ -189,7 +189,7 @@ void BarDescriptorConverter::fixImageAsset(QDomDocument &doc, const QString &def
imageElement = imageElement.nextSiblingElement(imageString)) { imageElement = imageElement.nextSiblingElement(imageString)) {
target = imageElement.text(); target = imageElement.text();
if (!target.isEmpty()) if (!target.isEmpty())
replaceAssetSourcePath(doc, target, QLatin1String(S_SRC_DIR) % target); replaceAssetSourcePath(doc, target, QLatin1String(S_SRC_DIR) + target);
} }
} else { } else {
log.logWarning(tr("Cannot find image asset definition: <%1>").arg(definitionElementName)); log.logWarning(tr("Cannot find image asset definition: <%1>").arg(definitionElementName));
@@ -235,7 +235,7 @@ bool BarDescriptorConverter::convertFile(Core::GeneratedFile &file, QString &err
setAsset(doc, applicationBinaryPath(), applicationBinaryName(), setAsset(doc, applicationBinaryPath(), applicationBinaryName(),
QLatin1String("Qnx/Elf"), true); QLatin1String("Qnx/Elf"), true);
const QString assetsString = QLatin1String("assets"); const QString assetsString = QLatin1String("assets");
replaceAssetSourcePath(doc, assetsString, QLatin1String(S_SRC_DIR) % assetsString); replaceAssetSourcePath(doc, assetsString, QLatin1String(S_SRC_DIR) + assetsString);
fixIconAsset(doc); fixIconAsset(doc);
fixSplashScreensAsset(doc); fixSplashScreensAsset(doc);

2
src/plugins/qnx/cascadesimport/importlog.cpp
View File

@@ -119,7 +119,7 @@ QString ImportLog::toString() const
{ {
QString ret; QString ret;
foreach (const ImportLogEntry &sle, *this) foreach (const ImportLogEntry &sle, *this)
ret += sle.toString() % QLatin1Char('\n'); ret += sle.toString() + QLatin1Char('\n');
return ret; return ret;
} }

2
src/plugins/qnx/cascadesimport/projectfileconverter.cpp
View File

@@ -73,7 +73,7 @@ static QMap<QString, QString> scanForDefinedVariables(const Core::GeneratedFile
QString k = line.mid(0, ix2).trimmed().toUpper(); QString k = line.mid(0, ix2).trimmed().toUpper();
QString v = line.mid(ix1 + 1).trimmed(); QString v = line.mid(ix1 + 1).trimmed();
if (ix1 != ix2) if (ix1 != ix2)
v = ret.value(k) % QLatin1Char(' ') % v; v = ret.value(k) + QLatin1Char(' ') + v;
ret[k] = v; ret[k] = v;
} }
} }