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 /tools/configure | |
| 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 'tools/configure')
| -rw-r--r-- | tools/configure/configure.pro | 4 | ||||
| -rw-r--r-- | tools/configure/environment.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index 810f006..0a49fbe 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -63,8 +63,8 @@ HEADERS = configureapp.h environment.h tools.h\ $$QT_SOURCE_TREE/src/corelib/tools/qunicodetables_p.h \ $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.h \ $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils_p.h \ - $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.h \ - $$QT_SOURCE_TREE/tools/shared/windows/registry.h + $$QT_SOURCE_TREE/tools/shared/symbian/epocroot_p.h \ + $$QT_SOURCE_TREE/tools/shared/windows/registry_p.h SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \ diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 03fd0cc..1866ef4 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -60,8 +60,8 @@ using namespace std; #include <qt_windows.h> #endif -#include <symbian/epocroot.h> // from tools/shared -#include <windows/registry.h> // from tools/shared +#include <symbian/epocroot_p.h> // from tools/shared +#include <windows/registry_p.h> // from tools/shared QT_BEGIN_NAMESPACE @@ -163,7 +163,7 @@ Compiler Environment::detectCompiler() QString paths = qgetenv("PATH"); QStringList pathlist = paths.toLower().split(";"); for(int i = 0; compiler_info[i].compiler; ++i) { - QString productPath = readRegistryKey(HKEY_LOCAL_MACHINE, compiler_info[i].regKey).toLower(); + QString productPath = qt_readRegistryKey(HKEY_LOCAL_MACHINE, compiler_info[i].regKey).toLower(); if (productPath.length()) { QStringList::iterator it; for(it = pathlist.begin(); it != pathlist.end(); ++it) { @@ -466,8 +466,8 @@ bool Environment::rmdir(const QString &name) QString Environment::symbianEpocRoot() { - // Call function defined in tools/shared/symbian/epocroot.h - return ::epocRoot(); + // Call function defined in tools/shared/symbian/epocroot_p.h + return ::qt_epocRoot(); } QT_END_NAMESPACE |