diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-27 23:00:12 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-27 23:00:12 (GMT) |
| commit | 37766cd0781218598daffeaa7fa9d1707ec14b38 (patch) | |
| tree | 28f19a5eda972a7d8a4f1425983e0273716891ec /tools/shared/windows/registry.cpp | |
| parent | 5e0c4463c8dc8857e9f64a1bdde9a94cd8c39c4d (diff) | |
| parent | 220d13f0e83f9a70e69d95cb78711fec309e83cc (diff) | |
| download | Qt-37766cd0781218598daffeaa7fa9d1707ec14b38.zip Qt-37766cd0781218598daffeaa7fa9d1707ec14b38.tar.gz Qt-37766cd0781218598daffeaa7fa9d1707ec14b38.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tools/shared/windows/registry.cpp')
| -rw-r--r-- | tools/shared/windows/registry.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/shared/windows/registry.cpp b/tools/shared/windows/registry.cpp index 48e9ae6..f520910 100644 --- a/tools/shared/windows/registry.cpp +++ b/tools/shared/windows/registry.cpp @@ -157,6 +157,9 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey) } RegCloseKey(handle); +#else + Q_UNUSED(parentHandle); + Q_UNUSED(rSubkey) #endif return result; |