diff options
author | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
commit | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (patch) | |
tree | c75af0ceed6555249c6a2413dc5c0ff0aec928bb /src/libs/installer/environmentvariablesoperation.cpp | |
parent | 2beb45ea0317d0bed9d6085bd927f5a55dff25d5 (diff) | |
parent | 407b19ff904244e287d62c7d02ca2a0779fc7b09 (diff) |
Merge branch '3.1' into master
Change-Id: I2ac4e385ee771892369d98495ceceb09c481c018
Diffstat (limited to 'src/libs/installer/environmentvariablesoperation.cpp')
-rw-r--r-- | src/libs/installer/environmentvariablesoperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/environmentvariablesoperation.cpp b/src/libs/installer/environmentvariablesoperation.cpp index 7a8dbfb5a..006ea3762 100644 --- a/src/libs/installer/environmentvariablesoperation.cpp +++ b/src/libs/installer/environmentvariablesoperation.cpp @@ -83,8 +83,8 @@ bool handleRegExpandSz(const QString ®Path, const QString &name, if (res == ERROR_SUCCESS) { DWORD dataType; DWORD dataSize; - res = RegQueryValueEx(handle, reinterpret_cast<const wchar_t *>(name.utf16()), 0, - &dataType, 0, &dataSize); + res = RegQueryValueEx(handle, reinterpret_cast<const wchar_t *>(name.utf16()), nullptr, + &dataType, nullptr, &dataSize); setAsExpandSZ = (res == ERROR_SUCCESS) && (dataType == REG_EXPAND_SZ); if (setAsExpandSZ) { RegCloseKey(handle); |