diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-27 20:20:02 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2012-11-28 11:11:47 +0100 |
| commit | 5ea0937167024f0f777b3a7cf27728ae46897240 (patch) | |
| tree | 0b95199af3991875ce0f3c8377cf86241e2c659f /src/libs/qmljs/qmljslink.cpp | |
| parent | 964c01a460323adb871682a66283816d5d826a05 (diff) | |
| download | qt-creator-5ea0937167024f0f777b3a7cf27728ae46897240.tar.gz | |
QmlJS: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I0c5654a978f47a4db5428936fd44633f21394830
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/libs/qmljs/qmljslink.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index cd37d08aed..4cd0af17c9 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -342,7 +342,7 @@ Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInf const QString &packagePath = importInfo.path(); // check the filesystem with full version foreach (const QString &importPath, importPaths) { - QString libraryPath = QString("%1/%2.%3").arg(importPath, packagePath, version.toString()); + QString libraryPath = QString::fromLatin1("%1/%2.%3").arg(importPath, packagePath, version.toString()); if (importLibrary(doc, libraryPath, &import, importPath)) { importFound = true; break; @@ -351,7 +351,7 @@ Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInf if (!importFound) { // check the filesystem with major version foreach (const QString &importPath, importPaths) { - QString libraryPath = QString("%1/%2.%3").arg(importPath, packagePath, + QString libraryPath = QString::fromLatin1("%1/%2.%3").arg(importPath, packagePath, QString::number(version.majorVersion())); if (importLibrary(doc, libraryPath, &import, importPath)) { importFound = true; @@ -362,7 +362,7 @@ Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInf if (!importFound) { // check the filesystem with no version foreach (const QString &importPath, importPaths) { - QString libraryPath = QString("%1/%2").arg(importPath, packagePath); + QString libraryPath = QString::fromLatin1("%1/%2").arg(importPath, packagePath); if (importLibrary(doc, libraryPath, &import, importPath)) { importFound = true; break; |