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

Fix Qt4 compilation

Browse Source 
Change-Id: I59f5e4ceec008adedb6f548502c7c90854c033ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Orgad Shaneh
2014-07-06 08:09:03 +03:00
committed by Orgad Shaneh
parent 6d0e12be19
commit def9695e42
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljsdocument.cpp
View File

@@ -568,10 +568,10 @@ void Snapshot::insertLibraryInfo(const QString &path, const LibraryInfo &info)
--iPath; --iPath;
if (safeName.indexIn(myPath.at(iPath)) != 0) if (safeName.indexIn(myPath.at(iPath)) != 0)
break; break;
ImportKey iKey(ImportType::Library, QStringList(myPath.mid(iPath)).join(QLatin1Char('.')), ImportKey iKey(ImportType::Library, QStringList(myPath.mid(iPath)).join(QLatin1String(".")),
importKey.majorVersion, importKey.minorVersion); importKey.majorVersion, importKey.minorVersion);
cImport.possibleExports.append(Export(iKey, QStringList(myPath.mid(0, iPath)) cImport.possibleExports.append(Export(iKey, QStringList(myPath.mid(0, iPath))
.join(QLatin1Char('/')), true)); .join(QLatin1String("/")), true));
} }
} else { } else {
QString requiredPath = QStringList(splitPath.mid(0, splitPath.size() - importKey.splitPath.size())) QString requiredPath = QStringList(splitPath.mid(0, splitPath.size() - importKey.splitPath.size()))
@@ -599,10 +599,10 @@ void Snapshot::insertLibraryInfo(const QString &path, const LibraryInfo &info)
--iPath; --iPath;
if (safeName.indexIn(splitPath.at(iPath)) != 0) if (safeName.indexIn(splitPath.at(iPath)) != 0)
break; break;
ImportKey iKey(ImportType::Library, QStringList(splitPath.mid(iPath)).join(QLatin1Char('.')), ImportKey iKey(ImportType::Library, QStringList(splitPath.mid(iPath)).join(QLatin1String(".")),
majorVersion, minorVersion); majorVersion, minorVersion);
cImport.possibleExports.append(Export(iKey, QStringList(splitPath.mid(0, iPath)) cImport.possibleExports.append(Export(iKey, QStringList(splitPath.mid(0, iPath))
.join(QLatin1Char('/')), true)); .join(QLatin1String("/")), true));
} }
} }
foreach (const QmlDirParser::Component &component, info.components()) { foreach (const QmlDirParser::Component &component, info.components()) {

2
src/plugins/valgrind/valgrindengine.cpp
View File

@@ -84,7 +84,7 @@ bool ValgrindRunControl::startEngine()
const AnalyzerStartParameters &sp = startParameters(); const AnalyzerStartParameters &sp = startParameters();
#if VALGRIND_DEBUG_OUTPUT #if VALGRIND_DEBUG_OUTPUT
emit outputReceived(tr("Valgrind options: %1").arg(toolArguments().join(QLatin1Char(' '))), DebugFormat); emit outputReceived(tr("Valgrind options: %1").arg(toolArguments().join(QLatin1String(" "))), DebugFormat);
emit outputReceived(tr("Working directory: %1").arg(sp.workingDirectory), DebugFormat); emit outputReceived(tr("Working directory: %1").arg(sp.workingDirectory), DebugFormat);
emit outputReceived(tr("Command line arguments: %1").arg(sp.debuggeeArgs), DebugFormat); emit outputReceived(tr("Command line arguments: %1").arg(sp.debuggeeArgs), DebugFormat);
#endif #endif

2
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -1198,7 +1198,7 @@ void tst_Dumpers::dumper()
<< QString::fromUtf8(m_debuggerBinary) << QString::fromUtf8(m_debuggerBinary)
<< t->buildPath + QLatin1String("/doit") << t->buildPath + QLatin1String("/doit")
<< QString::fromUtf8(expanded); << QString::fromUtf8(expanded);
//qDebug() << exe.constData() << ' ' << qPrintable(args.join(QLatin1Char(' '))); //qDebug() << exe.constData() << ' ' << qPrintable(args.join(QLatin1String(" ")));
} }
t->input = cmds; t->input = cmds;