Adapt to move of options to Edit > Preferences

Change-Id: I6881f658db9eec5059b434bce12093667535d5ac
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Eike Ziller
2022-06-28 10:08:45 +02:00
parent 139e190d77
commit e46357a220
13 changed files with 24 additions and 22 deletions

View File

@ -35,13 +35,13 @@ For more information about clang-format, see
1. Enable the Beautifier plugin and restart to load it. 1. Enable the Beautifier plugin and restart to load it.
2. Configure the plugin: 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 * Select a valid clang-format executable
* Use predefined style: File * Use predefined style: File
* Fallback style: None * Fallback style: None
3. Set shortcuts for convenience: 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 / FormatFile - e.g. Alt+C, F
* ClangFormat / FormatAtCursor - e.g. Alt+C, C * ClangFormat / FormatAtCursor - e.g. Alt+C, C
* ClangFormat / DisableFormattingSelectedText - e.g. Alt+C, D * ClangFormat / DisableFormattingSelectedText - e.g. Alt+C, D

View File

@ -51,10 +51,11 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const FilePath &fileName,
msg = QCoreApplication::translate("Utils::reloadPrompt", msg = QCoreApplication::translate("Utils::reloadPrompt",
"The file <i>%1</i> has been changed on disk. Do you want to reload it?"); "The file <i>%1</i> has been changed on disk. Do you want to reload it?");
} }
msg = "<p>" + msg.arg(fileName.fileName()) + "</p><p>" + msg = "<p>" + msg.arg(fileName.fileName()) + "</p><p>"
QCoreApplication::translate("Utils::reloadPrompt", + QCoreApplication::translate(
"The default behavior can be set in Tools > Options > Environment > System.") "Utils::reloadPrompt",
+ "</p>"; "The default behavior can be set in Edit > Preferences > Environment > System.")
+ "</p>";
return reloadPrompt(title, msg, fileName.toUserOutput(), enableDiffOption, parent); return reloadPrompt(title, msg, fileName.toUserOutput(), enableDiffOption, parent);
} }

View File

@ -385,7 +385,7 @@ QWidget *AndroidBuildApkWidget::createAdditionalLibrariesGroup()
m_openSslCheckBox = new QCheckBox(tr("Include prebuilt OpenSSL libraries")); m_openSslCheckBox = new QCheckBox(tr("Include prebuilt OpenSSL libraries"));
m_openSslCheckBox->setToolTip(tr("This is useful for apps that use SSL operations. The path " 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, connect(m_openSslCheckBox, &QAbstractButton::clicked, this,
&AndroidBuildApkWidget::onOpenSslCheckBoxChanged); &AndroidBuildApkWidget::onOpenSslCheckBoxChanged);

View File

@ -194,7 +194,7 @@ void AndroidPlugin::askUserAboutAndroidSetup()
info(kSetupAndroidSetting, info(kSetupAndroidSetting,
tr("Would you like to configure Android options? This will ensure " tr("Would you like to configure Android options? This will ensure "
"Android kits can be usable and all essential packages are installed. " "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); Utils::InfoBarEntry::GlobalSuppression::Enabled);
info.addCustomButton(tr("Configure Android"), [this] { info.addCustomButton(tr("Configure Android"), [this] {
Core::ICore::infoBar()->removeInfo(kSetupAndroidSetting); Core::ICore::infoBar()->removeInfo(kSetupAndroidSetting);

View File

@ -411,7 +411,7 @@ void CorePlugin::warnAboutCrashReporing()
Core::Constants::IDE_DISPLAY_NAME + tr(" > Preferences > Environment > System")); Core::Constants::IDE_DISPLAY_NAME + tr(" > Preferences > Environment > System"));
} else { } else {
warnStr = warnStr.arg(QLatin1String(Core::Constants::IDE_DISPLAY_NAME), warnStr = warnStr.arg(QLatin1String(Core::Constants::IDE_DISPLAY_NAME),
tr("Tools > Options > Environment > System")); tr("Edit > Preferences > Environment > System"));
} }
Utils::InfoBarEntry info(kWarnCrashReportingSetting, warnStr, Utils::InfoBarEntry info(kWarnCrashReportingSetting, warnStr,

View File

@ -65,7 +65,7 @@ public:
// This is typically the case for files that have not been opened yet, // This is typically the case for files that have not been opened yet,
// but can also happen later after they have been opened. // but can also happen later after they have been opened.
// The related setting for this is found in: // 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; bool isSuspended;
// The entry has been pinned, which means that it should stick to // 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 // the top of any lists of open files, and that any actions that close

View File

@ -470,17 +470,18 @@ void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler)
} }
case McuAbstractPackage::Status::InvalidPath: { case McuAbstractPackage::Status::InvalidPath: {
printMessage(McuPackage::tr( 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.") "Devices > MCU.")
.arg(qtForMCUsPackage->path().toUserOutput()), .arg(qtForMCUsPackage->path().toUserOutput()),
true); true);
break; break;
} }
case McuAbstractPackage::Status::EmptyPath: { case McuAbstractPackage::Status::EmptyPath: {
printMessage(McuPackage::tr( printMessage(
"Missing %1. Add the path in Tools > Options > Devices > MCU.") McuPackage::tr(
.arg(qtForMCUsPackage->detectionPath().toUserOutput()), "Missing %1. Add the path in Edit > Preferences > Devices > MCU.")
true); .arg(qtForMCUsPackage->detectionPath().toUserOutput()),
true);
return; return;
} }
default: default:
@ -492,7 +493,7 @@ void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler)
if (CMakeProjectManager::CMakeToolManager::cmakeTools().isEmpty()) { if (CMakeProjectManager::CMakeToolManager::cmakeTools().isEmpty()) {
printMessage( printMessage(
McuPackage::tr( 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."), "Kits > CMake."),
true); true);
return; return;

View File

@ -128,7 +128,7 @@ void McuSupportPlugin::askUserAboutMcuSupportKitsSetup()
Utils::InfoBarEntry info(setupMcuSupportKits, Utils::InfoBarEntry info(setupMcuSupportKits,
tr("Create Kits for Qt for MCUs? " 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); Utils::InfoBarEntry::GlobalSuppression::Enabled);
// clazy:excludeall=connect-3arg-lambda // clazy:excludeall=connect-3arg-lambda
info.addCustomButton(tr("Create Kits for Qt for MCUs"), [] { info.addCustomButton(tr("Create Kits for Qt for MCUs"), [] {

View File

@ -119,7 +119,7 @@ static void askAboutQtInstallation()
kLinkWithQtInstallationSetting, kLinkWithQtInstallationSetting,
QtSupportPlugin::tr( QtSupportPlugin::tr(
"Link with a Qt installation to automatically register Qt versions and kits? To do " "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); Utils::InfoBarEntry::GlobalSuppression::Enabled);
info.addCustomButton(QtSupportPlugin::tr("Link with Qt"), [] { info.addCustomButton(QtSupportPlugin::tr("Link with Qt"), [] {
ICore::infoBar()->removeInfo(kLinkWithQtInstallationSetting); ICore::infoBar()->removeInfo(kLinkWithQtInstallationSetting);

View File

@ -106,7 +106,7 @@ void WebAssemblyPlugin::askUserAboutEmSdkSetup()
InfoBarEntry info(setupWebAssemblyEmSdk, InfoBarEntry info(setupWebAssemblyEmSdk,
tr("Setup Emscripten SDK for WebAssembly? " 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); InfoBarEntry::GlobalSuppression::Enabled);
info.addCustomButton(tr("Setup Emscripten SDK"), [setupWebAssemblyEmSdk] { info.addCustomButton(tr("Setup Emscripten SDK"), [setupWebAssemblyEmSdk] {
ICore::infoBar()->removeInfo(setupWebAssemblyEmSdk); ICore::infoBar()->removeInfo(setupWebAssemblyEmSdk);

View File

@ -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) * 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 * Verify that there are sensible annotations added to editor
* Close the document * 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 * Code Coverage Added Code
* Partially Covered Code * Partially Covered Code
* Uncovered Code * Uncovered Code

View File

@ -58,7 +58,7 @@
// a test after a BREAK_HERE failed // a test after a BREAK_HERE failed
// Default: 0 // Default: 0
// Before using this, make sure that "Show a message box when receiving a signal" // 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 #ifndef USE_AUTORUN
#define USE_AUTORUN 0 #define USE_AUTORUN 0
#endif #endif

View File

@ -35,7 +35,7 @@ For testing:
install similar docker images containing Qt, e.g. darkmattercoder/qt-build 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, 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 but using the Run container gives a more restricted setup closer to a
real world scenario. real world scenario.