diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-05-17 14:55:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-05-17 14:55:02 +0200 |
| commit | 8e8ebc8f8819c187a7cc680764858a86c36b8307 (patch) | |
| tree | 89847fc4464c8ac9a00dbd74be79f1ed75a6ca86 /src/shared | |
| parent | b2e30e7ef86595c537062cb8261a0735b389949c (diff) | |
| parent | 330a30aa5b7562cf8d68f3bd870d3c9b5d15b2fc (diff) | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
coin/instructions/build.yaml
Change-Id: I697b0107e75c6259989247de2180437d7987ff37
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/registryaccess/registryaccess.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/shared/registryaccess/registryaccess.h b/src/shared/registryaccess/registryaccess.h index 21862ae4a19..b4e0c089583 100644 --- a/src/shared/registryaccess/registryaccess.h +++ b/src/shared/registryaccess/registryaccess.h @@ -20,10 +20,11 @@ enum AccessMode { Registry64Mode = 0x4 // Corresponds to QSettings::Registry64Format (5.7) }; -static const char *debuggerApplicationFileC = "qtcdebugger"; -static const WCHAR *debuggerRegistryKeyC = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"; -static const WCHAR *debuggerRegistryValueNameC = L"Debugger"; -static const WCHAR *autoRegistryValueNameC = L"Auto"; +constexpr const char debuggerApplicationFileC[] = "qtcdebugger"; +constexpr const WCHAR debuggerRegistryKeyC[] + = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"; +constexpr const WCHAR debuggerRegistryValueNameC[] = L"Debugger"; +constexpr const WCHAR autoRegistryValueNameC[] = L"Auto"; static inline QString wCharToQString(const WCHAR *w) { |