summaryrefslogtreecommitdiffstats
path: root/tools/shared/windows/registry.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-03-24 14:28:46 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-03-24 14:28:46 (GMT)
commitbbf096c7ba589d05df8b8bce724e9393deb8f3b4 (patch)
tree0689bfba547d519486eec6529fb3e88202615519 /tools/shared/windows/registry.cpp
parent6d0002fe9bc91b9901e56050d247fbded09c9c76 (diff)
parent8c10e0b73c312a6c1aacce11cc8d6f57dc94a09d (diff)
downloadQt-bbf096c7ba589d05df8b8bce724e9393deb8f3b4.zip
Qt-bbf096c7ba589d05df8b8bce724e9393deb8f3b4.tar.gz
Qt-bbf096c7ba589d05df8b8bce724e9393deb8f3b4.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tools/shared/windows/registry.cpp')
-rw-r--r--tools/shared/windows/registry.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/shared/windows/registry.cpp b/tools/shared/windows/registry.cpp
index d342d78..67d9b56 100644
--- a/tools/shared/windows/registry.cpp
+++ b/tools/shared/windows/registry.cpp
@@ -148,7 +148,7 @@ QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
}
default:
- qWarning("QSettings: unknown data %d type in windows registry", dataType);
+ qWarning("QSettings: unknown data %u type in windows registry", quint32(dataType));
break;
}