diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 09:41:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 09:41:36 +0200 |
| commit | 02164e0288f714f1ea93afb32548548686773d1d (patch) | |
| tree | d7ed16267f7659af63e78c8de8915ed0208b598b /src/corelib/io/qsettings_win.cpp | |
| parent | 4a7e7103e713448c05d9d30cab8b7e52406b46a6 (diff) | |
| parent | 6f27bb135246b7fe9d11ba58e05d2b7661bc2080 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ia1da879a7bd8f71a649661a1844144dd67d60b3a
Diffstat (limited to 'src/corelib/io/qsettings_win.cpp')
| -rw-r--r-- | src/corelib/io/qsettings_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index 679212ea21..6eb318006e 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -136,6 +136,8 @@ static void mergeKeySets(NameSet *dest, const QStringList &src) ** Wrappers for the insane windows registry API */ +// ### Qt 6: Use new helpers from qwinregistry.cpp (once bootstrap builds are obsolete) + // Open a key with the specified "perms". // "access" is to explicitly use the 32- or 64-bit branch. static HKEY openKey(HKEY parentHandle, REGSAM perms, const QString &rSubKey, REGSAM access = 0) |