diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-19 12:53:29 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-19 13:35:00 (GMT) |
| commit | 4b380543cc973d575a3ed0c77918adbe5b6133f0 (patch) | |
| tree | d7f618d55549f46a9b9bbb974d2ee7ad7a838183 /qmake/generators/win32/msvc_vcproj.cpp | |
| parent | 45ffd89f55a7769c66f6cf15e54994a264012f05 (diff) | |
| download | Qt-4b380543cc973d575a3ed0c77918adbe5b6133f0.zip Qt-4b380543cc973d575a3ed0c77918adbe5b6133f0.tar.gz Qt-4b380543cc973d575a3ed0c77918adbe5b6133f0.tar.bz2 | |
Fixed namespace issues related to epocroot.cpp
Task-number: QTBUG-15393
Reviewed-by: axis
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index a8ff306..6f27515 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -67,7 +67,7 @@ QT_END_NAMESPACE #ifdef Q_OS_WIN32 #include <qt_windows.h> -#include <windows/registry.h> +#include <windows/registry_p.h> QT_BEGIN_NAMESPACE @@ -119,7 +119,7 @@ DotNET which_dotnet_version() int installed = 0; int i = 0; for(; dotNetCombo[i].version; ++i) { - QString path = readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey); + QString path = qt_readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey); if(!path.isEmpty()) { ++installed; current_version = dotNetCombo[i].version; @@ -136,7 +136,7 @@ DotNET which_dotnet_version() i = installed = 0; for(; dotNetCombo[i].version; ++i) { - QString productPath = readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey).toLower(); + QString productPath = qt_readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey).toLower(); if (productPath.isEmpty()) continue; QStringList::iterator it; |