diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-21 17:48:50 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-01 10:59:41 (GMT) |
| commit | 7101a3fafb40cacb855ee07036ce4baacc5d202b (patch) | |
| tree | 619cb68cf1dd716a3ee527e103bb4901853e409e /src/tools | |
| parent | 2365b2dfd57770875b6eefb165ec27f3bf65dd0c (diff) | |
| download | Qt-7101a3fafb40cacb855ee07036ce4baacc5d202b.zip Qt-7101a3fafb40cacb855ee07036ce4baacc5d202b.tar.gz Qt-7101a3fafb40cacb855ee07036ce4baacc5d202b.tar.bz2 | |
Compile with QStringBuilder and QByteArray
Reviewed-by: Denis
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/moc.cpp | 4 | ||||
| -rw-r--r-- | src/tools/moc/preprocessor.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 5078b28..4a2ba68 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -292,8 +292,8 @@ void Moc::parseFunctionArguments(FunctionDef *def) arg.rightType += ' '; arg.rightType += lexem(); } - arg.normalizedType = normalizeType(arg.type.name + ' ' + arg.rightType); - arg.typeNameForCast = normalizeType(noRef(arg.type.name) + "(*)" + arg.rightType); + arg.normalizedType = normalizeType(QByteArray(arg.type.name + ' ' + arg.rightType)); + arg.typeNameForCast = normalizeType(QByteArray(noRef(arg.type.name) + "(*)" + arg.rightType)); if (test(EQ)) arg.isDefault = true; def->arguments += arg; diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index 6410d40..fbea82d 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -807,7 +807,7 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed) continue; QByteArray frameworkCandidate = include.left(slashPos); frameworkCandidate.append(".framework/Headers/"); - fi.setFile(QString::fromLocal8Bit(p.path + '/' + frameworkCandidate), QString::fromLocal8Bit(include.mid(slashPos + 1))); + fi.setFile(QString::fromLocal8Bit(QByteArray(p.path + '/' + frameworkCandidate)), QString::fromLocal8Bit(include.mid(slashPos + 1))); } else { fi.setFile(QString::fromLocal8Bit(p.path), QString::fromLocal8Bit(include)); } |