diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-07-06 08:09:03 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-07-06 07:21:48 +0200 |
| commit | def9695e428743ca7a333c0a53b93a001a8fdf0e (patch) | |
| tree | d769ad57a6347fc6e0ac530b35bf994b787fa878 | |
| parent | 6d0e12be19959d2ce9f1c9513fb2e2eae376188f (diff) | |
| download | qt-creator-def9695e428743ca7a333c0a53b93a001a8fdf0e.tar.gz | |
Fix Qt4 compilation
Change-Id: I59f5e4ceec008adedb6f548502c7c90854c033ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | src/libs/qmljs/qmljsdocument.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/valgrind/valgrindengine.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp index 1e92b35e08..f3e0eb5fe5 100644 --- a/src/libs/qmljs/qmljsdocument.cpp +++ b/src/libs/qmljs/qmljsdocument.cpp @@ -568,10 +568,10 @@ void Snapshot::insertLibraryInfo(const QString &path, const LibraryInfo &info) --iPath; if (safeName.indexIn(myPath.at(iPath)) != 0) 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); cImport.possibleExports.append(Export(iKey, QStringList(myPath.mid(0, iPath)) - .join(QLatin1Char('/')), true)); + .join(QLatin1String("/")), true)); } } else { 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; if (safeName.indexIn(splitPath.at(iPath)) != 0) break; - ImportKey iKey(ImportType::Library, QStringList(splitPath.mid(iPath)).join(QLatin1Char('.')), + ImportKey iKey(ImportType::Library, QStringList(splitPath.mid(iPath)).join(QLatin1String(".")), majorVersion, minorVersion); cImport.possibleExports.append(Export(iKey, QStringList(splitPath.mid(0, iPath)) - .join(QLatin1Char('/')), true)); + .join(QLatin1String("/")), true)); } } foreach (const QmlDirParser::Component &component, info.components()) { diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index f323b46ce2..99bb3ab4c9 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -84,7 +84,7 @@ bool ValgrindRunControl::startEngine() const AnalyzerStartParameters &sp = startParameters(); #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("Command line arguments: %1").arg(sp.debuggeeArgs), DebugFormat); #endif diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 15e75b36f9..e3b79fd1c6 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1198,7 +1198,7 @@ void tst_Dumpers::dumper() << QString::fromUtf8(m_debuggerBinary) << t->buildPath + QLatin1String("/doit") << QString::fromUtf8(expanded); - //qDebug() << exe.constData() << ' ' << qPrintable(args.join(QLatin1Char(' '))); + //qDebug() << exe.constData() << ' ' << qPrintable(args.join(QLatin1String(" "))); } t->input = cmds; |