Commit 5606b9d2 authored by Kai Koehne's avatar Kai Koehne

QtQuick wizard: Fix compilation for QT_USE_FAST_CONCATENATION

Use QString().arg() instead of + , which might be undefined if the
user adds QT_USE_FAST_CONCATENATION to the .pro file.

Task-number: QTCREATORBUG-5796
Change-Id: Ic842cae650c8fa898d72065f3a1c672f5eb893d4
Reviewed-on: http://codereview.qt.nokia.com/2939Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent ac87bca1
......@@ -53,11 +53,11 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
#ifdef Q_OS_UNIX
#ifdef Q_OS_MAC
if (!QDir::isAbsolutePath(path))
return QCoreApplication::applicationDirPath()
+ QLatin1String("/../Resources/") + path;
return QString::fromAscii("%1/../Resources/%2").arg(QCoreApplication::applicationDirPath(),
path);
#else
const QString pathInInstallDir = QCoreApplication::applicationDirPath()
+ QLatin1String("/../") + path;
const QString pathInInstallDir =
QString::fromAscii("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
if (pathInInstallDir.contains(QLatin1String("opt"))
&& pathInInstallDir.contains(QLatin1String("bin"))
&& QFileInfo(pathInInstallDir).exists()) {
......
......@@ -460,7 +460,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
}
}
const int QtQuickApp::StubVersion = 14;
const int QtQuickApp::StubVersion = 15;
} // namespace Internal
} // namespace Qt4ProjectManager
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment