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

Use QString::fromLatin1 instead of QString::fromAscii

Browse Source 
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:
Alessandro Portale
2011-11-07 17:28:56 +01:00
parent c79d8b32b4
commit c54444dc97
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -62,11 +62,11 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
if (!QDir::isAbsolutePath(path)) if (!QDir::isAbsolutePath(path))
return QString::fromAscii("%1/../Resources/%2").arg(QCoreApplication::applicationDirPath(), return QString::fromLatin1("%1/../Resources/%2")
path); .arg(QCoreApplication::applicationDirPath(), path);
#else #else
const QString pathInInstallDir = const QString pathInInstallDir =
QString::fromAscii("%1/../%2").arg(QCoreApplication::applicationDirPath(), path); QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
if (QFileInfo(pathInInstallDir).exists()) if (QFileInfo(pathInInstallDir).exists())
return pathInInstallDir; return pathInInstallDir;
#endif #endif

2
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
View File

@@ -466,7 +466,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
} }
} }
const int QtQuickApp::StubVersion = 16; const int QtQuickApp::StubVersion = 18;
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager