forked from qt-creator/qt-creator
Use QString::fromLatin1 instead of QString::fromAscii
There is no good reason to break the Qt coding style, here. The strings "%1/../Resources/%2" and "%1/../%2" are Latin1 aswell as Ascii. Change-Id: Idbf3b7650fd650f93293496839fec4d21626cd0b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
@@ -62,11 +62,11 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
|
||||
#ifdef Q_OS_UNIX
|
||||
#ifdef Q_OS_MAC
|
||||
if (!QDir::isAbsolutePath(path))
|
||||
return QString::fromAscii("%1/../Resources/%2").arg(QCoreApplication::applicationDirPath(),
|
||||
path);
|
||||
return QString::fromLatin1("%1/../Resources/%2")
|
||||
.arg(QCoreApplication::applicationDirPath(), path);
|
||||
#else
|
||||
const QString pathInInstallDir =
|
||||
QString::fromAscii("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
|
||||
QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
|
||||
if (QFileInfo(pathInInstallDir).exists())
|
||||
return pathInInstallDir;
|
||||
#endif
|
||||
|
||||
@@ -466,7 +466,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
|
||||
}
|
||||
}
|
||||
|
||||
const int QtQuickApp::StubVersion = 16;
|
||||
const int QtQuickApp::StubVersion = 18;
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Qt4ProjectManager
|
||||
|
||||
Reference in New Issue
Block a user