From fc37cb9824b1c73a88f9a1e495e814bafa19fc8d Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Wed, 18 May 2022 12:28:11 +0300 Subject: Replace QSettingsWrapper::Format with QSettings::Format This changes allows in follow-up commits to access windows registy with other than just NativeFormat. This is needed for 32-bit applications to access 64-bit registry and 64-bit application s to access 32-bit registry. Change-Id: I0b88f4eaa499e53e10162ae5343b95d06ddbfc27 Reviewed-by: Arttu Tarkiainen --- tests/auto/installer/clientserver/tst_clientserver.cpp | 3 +-- .../installer/createshortcutoperation/tst_createshortcutoperation.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/installer/clientserver/tst_clientserver.cpp b/tests/auto/installer/clientserver/tst_clientserver.cpp index ffd96d14e..5aa40a5a3 100644 --- a/tests/auto/installer/clientserver/tst_clientserver.cpp +++ b/tests/auto/installer/clientserver/tst_clientserver.cpp @@ -331,8 +331,7 @@ private slots: RemoteClient::instance().init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Debug, Protocol::StartAs::User); - QSettingsWrapper wrapper(static_cast(format), - QSettingsWrapper::UserScope, "digia", "clientserver"); + QSettingsWrapper wrapper(format, QSettingsWrapper::UserScope, "digia", "clientserver"); QCOMPARE(wrapper.isConnectedToServer(), false); wrapper.clear(); diff --git a/tests/auto/installer/createshortcutoperation/tst_createshortcutoperation.cpp b/tests/auto/installer/createshortcutoperation/tst_createshortcutoperation.cpp index 313cdf677..baf954a44 100644 --- a/tests/auto/installer/createshortcutoperation/tst_createshortcutoperation.cpp +++ b/tests/auto/installer/createshortcutoperation/tst_createshortcutoperation.cpp @@ -70,7 +70,7 @@ private: core->installDefaultComponentsSilently(); QSettingsWrapper user(QLatin1String("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\" - "CurrentVersion\\Explorer\\User Shell Folders"), QSettingsWrapper::NativeFormat); + "CurrentVersion\\Explorer\\User Shell Folders"), QSettings::NativeFormat); //Replace %USERS% from "Programs" const QString programs = replaceWindowsEnvironmentVariables(user.value(QLatin1String("Programs"), QString()).toString()); const QString startMenuDir = programs + QDir::separator() + "Qt Installer Framework Unit Test"; -- cgit v1.2.3