diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-18 10:39:09 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-18 14:42:53 (GMT) |
| commit | dfd5ee41532b55ef6aaa5fb7ed3b586fbac80fce (patch) | |
| tree | 07c8ee218417070af9f61ae99f76abd088a5e22b /tools/shared/windows | |
| parent | 4e73e8b530f77bf1f43042fb07038eb51cb0238f (diff) | |
| download | Qt-dfd5ee41532b55ef6aaa5fb7ed3b586fbac80fce.zip Qt-dfd5ee41532b55ef6aaa5fb7ed3b586fbac80fce.tar.gz Qt-dfd5ee41532b55ef6aaa5fb7ed3b586fbac80fce.tar.bz2 | |
Make epocroot resolving compatible with more build environments
This commit prepares epocroot.cpp and registry.cpp to be compilable
by lrelease and corelib.
Task-number: QTBUG-15393
Reviewed-by: axis
Diffstat (limited to 'tools/shared/windows')
| -rw-r--r-- | tools/shared/windows/registry.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/shared/windows/registry.cpp b/tools/shared/windows/registry.cpp index 67d9b56..2373839 100644 --- a/tools/shared/windows/registry.cpp +++ b/tools/shared/windows/registry.cpp @@ -42,6 +42,7 @@ #include <QtCore/qstringlist.h> #include "registry.h" +#ifdef Q_OS_WIN32 /*! Returns the path part of a registry key. e.g. @@ -73,10 +74,11 @@ static QString keyName(const QString &rKey) return rKey; QString res(rKey.mid(idx + 1)); - if (res == "Default" || res == ".") - res = ""; + if (res == QLatin1String("Default") || res == QLatin1String(".")) + res = QString(); return res; } +#endif QString readRegistryKey(HKEY parentHandle, const QString &rSubkey) { @@ -128,7 +130,7 @@ QString readRegistryKey(HKEY parentHandle, const QString &rSubkey) break; l.append(s); } - result = l.join(", "); + result = l.join(QLatin1String(", ")); break; } |