diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-24 18:13:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-24 18:13:39 (GMT) |
| commit | 3039c483cd2c402457e7f9cbc672ec9254d09c57 (patch) | |
| tree | 117077c4c4ab669d1db57ae89f7afbbb76a27bdb /tools/shared | |
| parent | 5ddcc726a623fea3534f76c07b6c1d2835a0e2d6 (diff) | |
| parent | e15d5fc7e1a82da38b765e55d040edbdf8621ae2 (diff) | |
| download | Qt-3039c483cd2c402457e7f9cbc672ec9254d09c57.zip Qt-3039c483cd2c402457e7f9cbc672ec9254d09c57.tar.gz Qt-3039c483cd2c402457e7f9cbc672ec9254d09c57.tar.bz2 | |
Merge remote branch 'origin/4.7' into HEAD
Conflicts:
src/declarative/qml/qdeclarativecompiler.cpp
Diffstat (limited to 'tools/shared')
| -rw-r--r-- | tools/shared/windows/registry.cpp | 2 |
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; } |