diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2011-11-07 17:28:56 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2011-11-08 11:48:16 +0100 |
| commit | c54444dc9725e92149d352b3395a6c573e663a64 (patch) | |
| tree | 89d0c5afef71e34ab7a90ae2ba91c9fc1d148307 | |
| parent | c79d8b32b4b0a490fce1fcd1c1f56242df4226d1 (diff) | |
| download | qt-creator-c54444dc9725e92149d352b3395a6c573e663a64.tar.gz | |
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>
| -rw-r--r-- | share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp index 35599af4b3..1bba248d97 100644 --- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -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 diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index a5d991f9f8..a2cf2171fc 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -466,7 +466,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const } } -const int QtQuickApp::StubVersion = 16; +const int QtQuickApp::StubVersion = 18; } // namespace Internal } // namespace Qt4ProjectManager |