Adapt to move of options to Edit > Preferences

Change-Id: I6881f658db9eec5059b434bce12093667535d5ac
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>

13 files changed, 24 insertions, 22 deletions

diff --git a/dist/clangformat/README.md b/dist/clangformat/README.md
index 26982360ae..e333fcc7fb 100644
--- a/dist/clangformat/README.md
+++ b/dist/clangformat/README.md
@@ -35,13 +35,13 @@ For more information about clang-format, see
   1. Enable the Beautifier plugin and restart to load it.
 
   2. Configure the plugin:
-     In Menu: Tools > Options > Beautifier > Tab: Clang Format
+     In Menu: Edit > Preferences > Beautifier > Tab: Clang Format
       * Select a valid clang-format executable
       * Use predefined style: File
           * Fallback style: None
 
   3. Set shortcuts for convenience:
-     In Menu: Tools > Options > Environment > Keyboard
+     In Menu: Edit > Preferences > Environment > Keyboard
       * ClangFormat / FormatFile - e.g. Alt+C, F
       * ClangFormat / FormatAtCursor - e.g. Alt+C, C
       * ClangFormat / DisableFormattingSelectedText - e.g. Alt+C, D
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index 212ef62289..276c272dbc 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -51,10 +51,11 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const FilePath &fileName,
         msg = QCoreApplication::translate("Utils::reloadPrompt",
                 "The file <i>%1</i> has been changed on disk. Do you want to reload it?");
     }
-    msg = "<p>" + msg.arg(fileName.fileName()) + "</p><p>" +
-            QCoreApplication::translate("Utils::reloadPrompt",
-                "The default behavior can be set in Tools > Options > Environment > System.")
-            + "</p>";
+    msg = "<p>" + msg.arg(fileName.fileName()) + "</p><p>"
+          + QCoreApplication::translate(
+              "Utils::reloadPrompt",
+              "The default behavior can be set in Edit > Preferences > Environment > System.")
+          + "</p>";
     return reloadPrompt(title, msg, fileName.toUserOutput(), enableDiffOption, parent);
 }
 
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 0746a6b9be..868e7e4129 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -385,7 +385,7 @@ QWidget *AndroidBuildApkWidget::createAdditionalLibrariesGroup()
 
     m_openSslCheckBox = new QCheckBox(tr("Include prebuilt OpenSSL libraries"));
     m_openSslCheckBox->setToolTip(tr("This is useful for apps that use SSL operations. The path "
-                                     "can be defined in Tools > Options > Devices > Android."));
+                                     "can be defined in Edit > Preferences > Devices > Android."));
     connect(m_openSslCheckBox, &QAbstractButton::clicked, this,
             &AndroidBuildApkWidget::onOpenSslCheckBoxChanged);
 
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index fad354094d..b5d19c12e7 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -194,7 +194,7 @@ void AndroidPlugin::askUserAboutAndroidSetup()
         info(kSetupAndroidSetting,
              tr("Would you like to configure Android options? This will ensure "
                 "Android kits can be usable and all essential packages are installed. "
-                "To do it later, select Options > Devices > Android."),
+                "To do it later, select Edit > Preferences > Devices > Android."),
              Utils::InfoBarEntry::GlobalSuppression::Enabled);
     info.addCustomButton(tr("Configure Android"), [this] {
         Core::ICore::infoBar()->removeInfo(kSetupAndroidSetting);
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index d11d0a51c2..d0c9f2265f 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -411,7 +411,7 @@ void CorePlugin::warnAboutCrashReporing()
                               Core::Constants::IDE_DISPLAY_NAME + tr(" > Preferences > Environment > System"));
     } else {
         warnStr = warnStr.arg(QLatin1String(Core::Constants::IDE_DISPLAY_NAME),
-                              tr("Tools > Options > Environment > System"));
+                              tr("Edit > Preferences > Environment > System"));
     }
 
     Utils::InfoBarEntry info(kWarnCrashReportingSetting, warnStr,
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.h b/src/plugins/coreplugin/editormanager/documentmodel.h
index e526132654..a4f759d4d7 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.h
+++ b/src/plugins/coreplugin/editormanager/documentmodel.h
@@ -65,7 +65,7 @@ public:
         // This is typically the case for files that have not been opened yet,
         // but can also happen later after they have been opened.
         // The related setting for this is found in:
-        // Options > Environment > System > Auto-suspend unmodified files
+        // Edit > Preferences > Environment > System > Auto-suspend unmodified files
         bool isSuspended;
         // The entry has been pinned, which means that it should stick to
         // the top of any lists of open files, and that any actions that close
diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 05e2aaa229..7e6edff59b 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -470,17 +470,18 @@ void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler)
                 }
                 case McuAbstractPackage::Status::InvalidPath: {
                     printMessage(McuPackage::tr(
-                                     "Path %1 does not exist. Add the path in Tools > Options > "
+                                     "Path %1 does not exist. Add the path in Edit > Preferences > "
                                      "Devices > MCU.")
                                      .arg(qtForMCUsPackage->path().toUserOutput()),
                                  true);
                     break;
                 }
                 case McuAbstractPackage::Status::EmptyPath: {
-                    printMessage(McuPackage::tr(
-                                     "Missing %1. Add the path in Tools > Options > Devices > MCU.")
-                                     .arg(qtForMCUsPackage->detectionPath().toUserOutput()),
-                                 true);
+                    printMessage(
+                        McuPackage::tr(
+                            "Missing %1. Add the path in Edit > Preferences > Devices > MCU.")
+                            .arg(qtForMCUsPackage->detectionPath().toUserOutput()),
+                        true);
                     return;
                 }
                 default:
@@ -492,7 +493,7 @@ void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler)
             if (CMakeProjectManager::CMakeToolManager::cmakeTools().isEmpty()) {
                 printMessage(
                     McuPackage::tr(
-                        "No CMake tool was detected. Add a CMake tool in Tools > Options > "
+                        "No CMake tool was detected. Add a CMake tool in Edit > Preferences > "
                         "Kits > CMake."),
                     true);
                 return;
diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index 4944e6d68e..903999a210 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -128,7 +128,7 @@ void McuSupportPlugin::askUserAboutMcuSupportKitsSetup()
 
     Utils::InfoBarEntry info(setupMcuSupportKits,
                              tr("Create Kits for Qt for MCUs? "
-                                "To do it later, select Options > Devices > MCU."),
+                                "To do it later, select Edit > Preferences > Devices > MCU."),
                              Utils::InfoBarEntry::GlobalSuppression::Enabled);
     // clazy:excludeall=connect-3arg-lambda
     info.addCustomButton(tr("Create Kits for Qt for MCUs"), [] {
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 0265c493eb..442175a30f 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -119,7 +119,7 @@ static void askAboutQtInstallation()
         kLinkWithQtInstallationSetting,
         QtSupportPlugin::tr(
             "Link with a Qt installation to automatically register Qt versions and kits? To do "
-            "this later, select Options > Kits > Qt Versions > Link with Qt."),
+            "this later, select Edit > Preferences > Kits > Qt Versions > Link with Qt."),
         Utils::InfoBarEntry::GlobalSuppression::Enabled);
     info.addCustomButton(QtSupportPlugin::tr("Link with Qt"), [] {
         ICore::infoBar()->removeInfo(kLinkWithQtInstallationSetting);
diff --git a/src/plugins/webassembly/webassemblyplugin.cpp b/src/plugins/webassembly/webassemblyplugin.cpp
index a2cf03826e..2ad5fd943f 100644
--- a/src/plugins/webassembly/webassemblyplugin.cpp
+++ b/src/plugins/webassembly/webassemblyplugin.cpp
@@ -106,7 +106,7 @@ void WebAssemblyPlugin::askUserAboutEmSdkSetup()
 
     InfoBarEntry info(setupWebAssemblyEmSdk,
                       tr("Setup Emscripten SDK for WebAssembly? "
-                         "To do it later, select Options > Devices > WebAssembly."),
+                         "To do it later, select Edit > Preferences > Devices > WebAssembly."),
                       InfoBarEntry::GlobalSuppression::Enabled);
     info.addCustomButton(tr("Setup Emscripten SDK"), [setupWebAssemblyEmSdk] {
         ICore::infoBar()->removeInfo(setupWebAssemblyEmSdk);
diff --git a/tests/manual/coco/README.md b/tests/manual/coco/README.md
index 8adbe3a37e..e795cacd8c 100644
--- a/tests/manual/coco/README.md
+++ b/tests/manual/coco/README.md
@@ -22,7 +22,7 @@ the .csexe for the coverage scan (/path/to/squish/tutorial/hello.csexe)
 * Open a file that was part of the coverage scan (/path/to/squish/tutorial/tutorial.cpp)
 * Verify that there are sensible annotations added to editor
 * Close the document
-* Goto Tools > Options > TextEditor > Font & Colors and change some formats of
+* Goto Edit > Preferences > TextEditor > Font & Colors and change some formats of
     * Code Coverage Added Code
     * Partially Covered Code
     * Uncovered Code
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index 915f7c8c9f..d51854d539 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -58,7 +58,7 @@
 // a test after a BREAK_HERE failed
 // Default: 0
 // Before using this, make sure that "Show a message box when receiving a signal"
-// is disabled in "Tools" -> "Options..." -> "Debugger" -> "GDB".
+// is disabled in "Edit" -> "Preferences..." -> "Debugger" -> "GDB".
 #ifndef USE_AUTORUN
 #define USE_AUTORUN 0
 #endif
diff --git a/tests/manual/docker/README.md b/tests/manual/docker/README.md
index 078127fe60..f7eec1e4dd 100644
--- a/tests/manual/docker/README.md
+++ b/tests/manual/docker/README.md
@@ -35,7 +35,7 @@ For testing:
 
   install similar docker images containing Qt, e.g.  darkmattercoder/qt-build
 
-- Go to Tools -> Options -> Devices, 'Add', 'Apply' for both images.
+- Go to Edit -> Preferences -> Devices, 'Add', 'Apply' for both images.
   Note that the Build container alone is sufficient also to run applications,
   but using the Run container gives a more restricted setup closer to a
   real world scenario.