diff options
50 files changed, 2 insertions, 65 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 0cd77cee29..f2adb8b620 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -546,6 +546,7 @@ int main(int argc, char **argv) #endif app.setAttribute(Qt::AA_UseHighDpiPixmaps); + app.setAttribute(Qt::AA_DisableWindowContextHelpButton); PluginManager pluginManager; PluginManager::setPluginIID(QLatin1String("org.qt-project.Qt.QtCreatorPlugin")); diff --git a/src/libs/extensionsystem/pluginerroroverview.cpp b/src/libs/extensionsystem/pluginerroroverview.cpp index acf4d6f25b..25b3f70aaa 100644 --- a/src/libs/extensionsystem/pluginerroroverview.cpp +++ b/src/libs/extensionsystem/pluginerroroverview.cpp @@ -41,8 +41,6 @@ PluginErrorOverview::PluginErrorOverview(QWidget *parent) : QDialog(parent), m_ui(new Internal::Ui::PluginErrorOverview) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - m_ui->setupUi(this); m_ui->buttonBox->addButton(tr("Continue"), QDialogButtonBox::AcceptRole); diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp index ccf773cb99..0cded34acd 100644 --- a/src/libs/utils/checkablemessagebox.cpp +++ b/src/libs/utils/checkablemessagebox.cpp @@ -118,7 +118,6 @@ CheckableMessageBox::CheckableMessageBox(QWidget *parent) : d(new CheckableMessageBoxPrivate(this)) { setModal(true); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); connect(d->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(d->buttonBox, &QDialogButtonBox::clicked, diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp index 4f92a79680..2b78dc7661 100644 --- a/src/libs/utils/namevaluesdialog.cpp +++ b/src/libs/utils/namevaluesdialog.cpp @@ -89,7 +89,6 @@ void NameValueItemsWidget::setPlaceholderText(const QString &text) NameValuesDialog::NameValuesDialog(const QString &windowTitle, const QString &helpText, QWidget *parent) : QDialog(parent) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); resize(640, 480); m_editor = new Internal::NameValueItemsWidget(this); auto box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index 4efd1495b7..c3a850b28b 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -320,7 +320,6 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) : setOption(QWizard::NoBackButtonOnStartPage, true); if (!Utils::creatorTheme()->preferredStyles().isEmpty()) setWizardStyle(QWizard::ModernStyle); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); if (HostOsInfo::isMacHost()) { setButtonLayout(QList<QWizard::WizardButton>() diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index c1632b5c20..fa529a902b 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -746,7 +746,6 @@ RunConfigurationSelectionDialog::RunConfigurationSelectionDialog(const QString & QWidget *parent) : QDialog(parent) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Select Run Configuration")); QString details = tr("Could not determine which run configuration to choose for running tests"); diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index f43efb28e9..10f2122266 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -368,7 +368,6 @@ private: // Disable help button in titlebar on windows: Qt::WindowFlags flags = changeDialog->windowFlags(); - flags &= ~Qt::WindowContextHelpButtonHint; flags |= Qt::MSWindowsFixedSizeDialogHint; changeDialog->setWindowFlags(flags); diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index 261f975cc4..8cb8f1770e 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -181,8 +181,6 @@ NewDialog::NewDialog(QWidget *parent) : m_currentDialog = this; - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - setWindowFlags(windowFlags()); setAttribute(Qt::WA_DeleteOnClose); ICore::registerWindow(this, Context("Core.NewDialog")); m_ui->setupUi(this); diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp index 526a32f7e5..bd3e700a56 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp +++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp @@ -36,7 +36,6 @@ OpenWithDialog::OpenWithDialog(const QString &fileName, QWidget *parent) : QDialog(parent) { setupUi(this); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); label->setText(tr("Open file \"%1\" with:").arg(Utils::FilePath::fromString(fileName).fileName())); buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp index d29c56aef0..ef696df28b 100644 --- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp +++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.cpp @@ -64,7 +64,6 @@ PromptOverwriteDialog::PromptOverwriteDialog(QWidget *parent) : { setWindowTitle(tr("Overwrite Existing Files")); setModal(true); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); auto mainLayout = new QVBoxLayout(this); mainLayout->addWidget(m_label); m_view->setRootIsDecorated(false); diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index d41445d8f7..697e0a33c2 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -163,7 +163,6 @@ ReadOnlyFilesDialog::ReadOnlyFilesDialog(const Utils::FilePaths &filePaths, QWid : QDialog(parent) , d(new ReadOnlyFilesDialogPrivate(this)) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); d->initDialog(filePaths); } diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp index 94c0bbddc1..efeca72273 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp @@ -49,7 +49,6 @@ SaveItemsDialog::SaveItemsDialog(QWidget *parent, : QDialog(parent) { m_ui.setupUi(this); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); // QDialogButtonBox's behavior for "destructive" is wrong, the "do not save" should be left-aligned const QDialogButtonBox::ButtonRole discardButtonRole = Utils::HostOsInfo::isMacHost() diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 302a504217..459af08a4a 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -450,7 +450,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) : m_filterLineEdit->setFiltering(true); createGui(); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); if (Utils::HostOsInfo::isMacHost()) setWindowTitle(QCoreApplication::translate("Core::Internal::SettingsDialog", "Preferences")); else diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp index fa523fa318..f3dceb73a8 100644 --- a/src/plugins/coreplugin/plugindialog.cpp +++ b/src/plugins/coreplugin/plugindialog.cpp @@ -55,8 +55,6 @@ PluginDialog::PluginDialog(QWidget *parent) : QDialog(parent), m_view(new ExtensionSystem::PluginView(this)) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - auto vl = new QVBoxLayout(this); auto filterLayout = new QHBoxLayout; diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index b1ef2edb10..3ef40cb819 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -52,7 +52,6 @@ VersionDialog::VersionDialog(QWidget *parent) setWindowIcon(Icons::QTCREATORLOGO_BIG.icon()); setWindowTitle(tr("About %1").arg(Core::Constants::IDE_DISPLAY_NAME)); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); auto layout = new QGridLayout(this); layout->setSizeConstraint(QLayout::SetFixedSize); diff --git a/src/plugins/cppeditor/cpppreprocessordialog.cpp b/src/plugins/cppeditor/cpppreprocessordialog.cpp index b0edff0fc0..03b01a05b2 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.cpp +++ b/src/plugins/cppeditor/cpppreprocessordialog.cpp @@ -39,8 +39,6 @@ CppPreProcessorDialog::CppPreProcessorDialog(const QString &filePath, QWidget *p , m_ui(new Ui::CppPreProcessorDialog()) , m_filePath(filePath) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - m_ui->setupUi(this); m_ui->editorLabel->setText(m_ui->editorLabel->text().arg(Utils::FilePath::fromString(m_filePath).fileName())); m_ui->editWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp index 084ab82bee..e34d0df38d 100644 --- a/src/plugins/debugger/analyzer/startremotedialog.cpp +++ b/src/plugins/debugger/analyzer/startremotedialog.cpp @@ -58,7 +58,6 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent) : QDialog(parent) , d(new Internal::StartRemoteDialogPrivate) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Start Remote Analysis")); d->kitChooser = new KitChooser(this); diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index df2f62dd84..ae840e772c 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -874,7 +874,6 @@ private: MultiBreakPointsDialog::MultiBreakPointsDialog(unsigned int enabledParts, QWidget *parent) : QDialog(parent) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Edit Breakpoint Properties")); m_lineEditCondition = new QLineEdit(this); diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 313b8a7d0a..dabf9f7b6f 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -206,7 +206,6 @@ void StartApplicationParameters::fromSettings(const QSettings *settings) StartApplicationDialog::StartApplicationDialog(QWidget *parent) : QDialog(parent), d(new StartApplicationDialogPrivate) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Start Debugger")); d->kitChooser = new KitChooser(this); @@ -515,7 +514,6 @@ AttachToQmlPortDialog::AttachToQmlPortDialog(QWidget *parent) : QDialog(parent), d(new AttachToQmlPortDialogPrivate) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Start Debugger")); d->kitChooser = new KitChooser(this); @@ -599,7 +597,6 @@ StartRemoteCdbDialog::StartRemoteCdbDialog(QWidget *parent) : QDialog(parent), m_lineEdit(new QLineEdit) { setWindowTitle(tr("Start a CDB Remote Session")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); auto groupBox = new QGroupBox; @@ -671,7 +668,6 @@ AddressDialog::AddressDialog(QWidget *parent) : m_box(new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel)) { setWindowTitle(tr("Select Start Address")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); auto hLayout = new QHBoxLayout; hLayout->addWidget(new QLabel(tr("Enter an address:") + ' ')); @@ -749,7 +745,6 @@ public: StartRemoteEngineDialog::StartRemoteEngineDialog(QWidget *parent) : QDialog(parent), d(new StartRemoteEngineDialogPrivate) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Start Remote Engine")); d->host = new FancyLineEdit(this); @@ -903,7 +898,6 @@ TypeFormatsDialog::TypeFormatsDialog(QWidget *parent) : QDialog(parent), m_ui(new TypeFormatsDialogUi(this)) { setWindowTitle(tr("Type Formats")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_ui->addPage(tr("Qt Types")); m_ui->addPage(tr("Standard Types")); m_ui->addPage(tr("Misc Types")); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index bb84ac2a85..2ad5ebc740 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -677,7 +677,7 @@ public: } QInputDialog dialog; // Create wide input dialog. dialog.setWindowFlags(dialog.windowFlags() - & ~(Qt::WindowContextHelpButtonHint|Qt::MSWindowsFixedSizeDialogHint)); + & ~(Qt::MSWindowsFixedSizeDialogHint)); dialog.resize(600, dialog.height()); dialog.setWindowTitle(tr("Add Message Tracepoint")); dialog.setLabelText (tr("Message:")); diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp index e264614611..d4af42714d 100644 --- a/src/plugins/debugger/loadcoredialog.cpp +++ b/src/plugins/debugger/loadcoredialog.cpp @@ -251,7 +251,6 @@ AttachCoreDialog::AttachCoreDialog(QWidget *parent) : QDialog(parent), d(new AttachCoreDialogPrivate) { setWindowTitle(tr("Load Core File")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); d->buttonBox = new QDialogButtonBox(this); d->buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp index 0c86728f21..0bd667f457 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.cpp @@ -51,7 +51,6 @@ CacheDirectoryDialog::CacheDirectoryDialog(QWidget *parent) : { setWindowTitle(tr("Select Local Cache Folder")); setModal(true); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); auto formLayout = new QFormLayout; m_chooser->setExpectedKind(Utils::PathChooser::ExistingDirectory); diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp index 7f20afaeef..51d27228d1 100644 --- a/src/plugins/debugger/stackhandler.cpp +++ b/src/plugins/debugger/stackhandler.cpp @@ -337,7 +337,6 @@ static StackFrame inputFunctionForDisassembly() dialog.setInputMode(QInputDialog::TextInput); dialog.setLabelText(StackHandler::tr("Function:")); dialog.setWindowTitle(StackHandler::tr("Disassemble Function")); - dialog.setWindowFlags(dialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); if (dialog.exec() != QDialog::Accepted) return frame; const QString function = dialog.textValue(); diff --git a/src/plugins/debugger/unstartedappwatcherdialog.cpp b/src/plugins/debugger/unstartedappwatcherdialog.cpp index 423bcf4699..c27ff5f72e 100644 --- a/src/plugins/debugger/unstartedappwatcherdialog.cpp +++ b/src/plugins/debugger/unstartedappwatcherdialog.cpp @@ -87,7 +87,6 @@ UnstartedAppWatcherDialog::UnstartedAppWatcherDialog(QWidget *parent) : QDialog(parent) { setWindowTitle(tr("Attach to Process Not Yet Started")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_kitChooser = new KitChooser(this); m_kitChooser->setKitPredicate([](const Kit *k) { diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index 47a55be5c5..c1cc46ce98 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -57,7 +57,6 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co QWidget *parent) : QDialog(parent), m_ui(new Ui::ChangeSelectionDialog) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_gitExecutable = GitPlugin::client()->vcsBinary(); m_ui->setupUi(this); m_ui->workingDirectoryChooser->setExpectedKind(PathChooser::ExistingDirectory); diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp index 402c29763a..875ca8b44f 100644 --- a/src/plugins/git/gerrit/gerritdialog.cpp +++ b/src/plugins/git/gerrit/gerritdialog.cpp @@ -63,8 +63,6 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p, , m_model(new GerritModel(p, this)) , m_queryModel(new QStringListModel(this)) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - m_ui->setupUi(this); m_ui->remoteComboBox->setParameters(m_parameters); m_ui->remoteComboBox->setFallbackEnabled(true); diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 9a251b5eda..08c280fc90 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -128,7 +128,6 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev m_workingDir(workingDir), m_ui(new Ui::GerritPushDialog) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_ui->setupUi(this); m_ui->repositoryLabel->setText(QDir::toNativeSeparators(workingDir)); m_ui->remoteComboBox->setRepository(workingDir); diff --git a/src/plugins/git/gitutils.cpp b/src/plugins/git/gitutils.cpp index c0f5ffd754..1161d2cfcd 100644 --- a/src/plugins/git/gitutils.cpp +++ b/src/plugins/git/gitutils.cpp @@ -69,7 +69,6 @@ bool Stash::parseStashLine(const QString &l) bool inputText(QWidget *parent, const QString &title, const QString &prompt, QString *s) { QInputDialog dialog(parent); - dialog.setWindowFlags(dialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); dialog.setWindowTitle(title); dialog.setLabelText(prompt); dialog.setTextValue(*s); diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index e57dda49e0..25c59bbcb7 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.cpp @@ -227,7 +227,6 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) : connect(m_widget, &LogChangeWidget::activated, okButton, [okButton] { okButton->animateClick(); }); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); resize(600, 400); } diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index 50b7a994f2..b0e629f064 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -53,7 +53,6 @@ public: m_remoteNames(remoteNames) { m_ui.setupUi(this); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_ui.nameEdit->setValidationFunction([this](Utils::FancyLineEdit *edit, QString *errorMessage) { if (!edit) return false; @@ -127,7 +126,6 @@ RemoteDialog::RemoteDialog(QWidget *parent) : m_remoteModel(new RemoteModel(this)) { setModal(false); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setAttribute(Qt::WA_DeleteOnClose, true); // Do not update unnecessarily m_ui->setupUi(this); diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index e20cb6dcc8..ef1b324f58 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -102,7 +102,6 @@ StashDialog::StashDialog(QWidget *parent) : QDialog(parent), m_restoreCurrentInBranchButton(new QPushButton(tr("Restore to &Branch..."))), m_refreshButton(new QPushButton(tr("Re&fresh"))) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setAttribute(Qt::WA_DeleteOnClose, true); // Do not update unnecessarily ui->setupUi(this); diff --git a/src/plugins/imageviewer/exportdialog.cpp b/src/plugins/imageviewer/exportdialog.cpp index 682a7dfd30..37a59b9625 100644 --- a/src/plugins/imageviewer/exportdialog.cpp +++ b/src/plugins/imageviewer/exportdialog.cpp @@ -88,8 +88,6 @@ ExportDialog::ExportDialog(QWidget *parent) , m_heightSpinBox(new QSpinBox(this)) , m_aspectRatio(1) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - auto formLayout = new QFormLayout(this); m_pathChooser->setMinimumWidth(QApplication::desktop()->availableGeometry(this).width() / 5); diff --git a/src/plugins/imageviewer/multiexportdialog.cpp b/src/plugins/imageviewer/multiexportdialog.cpp index b47c52aaeb..b377cc7243 100644 --- a/src/plugins/imageviewer/multiexportdialog.cpp +++ b/src/plugins/imageviewer/multiexportdialog.cpp @@ -184,8 +184,6 @@ MultiExportDialog::MultiExportDialog(QWidget *parent) , m_pathChooser(new Utils::PathChooser(this)) , m_sizesLineEdit(new QLineEdit) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - auto formLayout = new QFormLayout(this); m_pathChooser->setMinimumWidth(QApplication::desktop()->availableGeometry(this).width() / 5); diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index cfafd86cbb..c27a8f599a 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -842,7 +842,6 @@ public: connect(filter, &QLineEdit::textChanged, proxy, &QSortFilterProxyModel::setFilterWildcard); listView->setModel(proxy); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setModal(true); } diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp index 2e0cf6a660..3734977c4b 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp @@ -124,7 +124,6 @@ DeviceProcessesDialogPrivate::DeviceProcessesDialogPrivate(KitChooser *chooser, , buttonBox(new QDialogButtonBox(parent)) { q->setWindowTitle(DeviceProcessesDialog::tr("List of Processes")); - q->setWindowFlags(q->windowFlags() & ~Qt::WindowContextHelpButtonHint); q->setMinimumHeight(500); processList = nullptr; diff --git a/src/plugins/projectexplorer/waitforstopdialog.cpp b/src/plugins/projectexplorer/waitforstopdialog.cpp index 1a7852989d..f2d3abb152 100644 --- a/src/plugins/projectexplorer/waitforstopdialog.cpp +++ b/src/plugins/projectexplorer/waitforstopdialog.cpp @@ -39,7 +39,6 @@ WaitForStopDialog::WaitForStopDialog(QList<ProjectExplorer::RunControl *> runCon m_runControls(runControls) { setWindowTitle(tr("Waiting for Applications to Stop")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); auto layout = new QVBoxLayout(); setLayout(layout); diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.cpp b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.cpp index ee90b117e0..dd234a074c 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.cpp +++ b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.cpp @@ -48,7 +48,6 @@ AnnotationEditorDialog::AnnotationEditorDialog(QWidget *parent, const QString &t { ui->setupUi(this); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlag(Qt::Tool, true); setWindowTitle(titleString); setModal(true); diff --git a/src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp b/src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp index f368aee38b..3e6d838990 100644 --- a/src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp +++ b/src/plugins/qmldesigner/components/bindingeditor/bindingeditordialog.cpp @@ -45,7 +45,6 @@ BindingEditorDialog::BindingEditorDialog(QWidget *parent, DialogType type) : QDialog(parent) , m_dialogType(type) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlag(Qt::Tool, true); setWindowTitle(defaultTitle()); setModal(false); diff --git a/src/plugins/qmldesigner/components/componentcore/addimagesdialog.cpp b/src/plugins/qmldesigner/components/componentcore/addimagesdialog.cpp index 10a992ae1b..062403d39f 100644 --- a/src/plugins/qmldesigner/components/componentcore/addimagesdialog.cpp +++ b/src/plugins/qmldesigner/components/componentcore/addimagesdialog.cpp @@ -95,7 +95,6 @@ QString AddImagesDialog::getDirectory(const QStringList &fileNames, const QStrin QString directory = defaultDirectory; dialog->setModal(true); - dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); dialog->setWindowTitle(QCoreApplication::translate("AddImageToResources","Add Resources")); QTableWidget *table = createFilesTable(fileNames); table->setParent(dialog); diff --git a/src/plugins/qmldesigner/components/connectioneditor/addnewbackenddialog.cpp b/src/plugins/qmldesigner/components/connectioneditor/addnewbackenddialog.cpp index 9de928ae90..49f47dfef2 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/addnewbackenddialog.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/addnewbackenddialog.cpp @@ -34,7 +34,6 @@ AddNewBackendDialog::AddNewBackendDialog(QWidget *parent) : QDialog(parent), m_ui(new Ui::AddNewBackendDialog) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_ui->setupUi(this); connect(m_ui->comboBox, &QComboBox::currentTextChanged, this, &AddNewBackendDialog::invalidate); diff --git a/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp b/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp index 2c4fb147b0..71fcb1a260 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/animationcurvedialog.cpp @@ -33,14 +33,12 @@ AnimationCurveDialog::AnimationCurveDialog(QWidget *parent) : QDialog(parent) , m_editor(nullptr) { - setWindowFlag(Qt::WindowContextHelpButtonHint, false); } AnimationCurveDialog::AnimationCurveDialog(DesignTools::CurveEditorModel *model, QWidget *parent) : QDialog(parent) , m_editor(nullptr) { - setWindowFlag(Qt::WindowContextHelpButtonHint, false); setModel(model); } diff --git a/src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp b/src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp index 938cc0dce1..91ab233900 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/easingcurvedialog.cpp @@ -61,7 +61,6 @@ EasingCurveDialog::EasingCurveDialog(const QList<ModelNode> &frames, QWidget *pa , m_label(new QLabel) , m_frames(frames) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlag(Qt::Tool, true); auto tw = new QTabWidget; diff --git a/src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp b/src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp index dbb70ca07a..70f382e859 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp @@ -36,7 +36,6 @@ SetFrameValueDialog::SetFrameValueDialog(qreal frame, const QVariant &value, , ui(new Ui::SetFrameValueDialog) { ui->setupUi(this); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Edit Keyframe")); setFixedSize(size()); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsdialog.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsdialog.cpp index 960c409553..8b098e92ba 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsdialog.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesettingsdialog.cpp @@ -102,7 +102,6 @@ TimelineSettingsDialog::TimelineSettingsDialog(QWidget *parent, TimelineView *vi { m_timelineSettingsModel = new TimelineSettingsModel(this, view); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); ui->setupUi(this); auto *timelineCornerWidget = new QToolBar; diff --git a/src/plugins/qmldesigner/openuiqmlfiledialog.cpp b/src/plugins/qmldesigner/openuiqmlfiledialog.cpp index 545719623f..bfb49c25c5 100644 --- a/src/plugins/qmldesigner/openuiqmlfiledialog.cpp +++ b/src/plugins/qmldesigner/openuiqmlfiledialog.cpp @@ -36,7 +36,6 @@ OpenUiQmlFileDialog::OpenUiQmlFileDialog(QWidget *parent) : QDialog(parent), ui(new Ui::OpenUiQmlFileDialog) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); ui->setupUi(this); connect(ui->cancelButton, &QPushButton::clicked, this, &QDialog::close); diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp index 43b1d500a0..1762c4a85c 100644 --- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp @@ -51,7 +51,6 @@ QmlProfilerAttachDialog::QmlProfilerAttachDialog(QWidget *parent) : QDialog(parent), d(new QmlProfilerAttachDialogPrivate) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowTitle(tr("Start QML Profiler")); d->kitChooser = new KitChooser(this); diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 38526b4b7b..f8a65cb9fe 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -995,7 +995,6 @@ void SubversionPluginPrivate::slotDescribe() QTC_ASSERT(state.hasTopLevel(), return); QInputDialog inputDialog(ICore::dialogParent()); - inputDialog.setWindowFlags(inputDialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); inputDialog.setInputMode(QInputDialog::IntInput); inputDialog.setIntRange(1, INT_MAX); inputDialog.setWindowTitle(tr("Describe")); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 713d54187f..64475eba24 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -1338,9 +1338,6 @@ HeobDialog::HeobDialog(QWidget *parent) : m_profileDeleteButton->setEnabled(m_profilesCombo->count() > 1); setWindowTitle(tr("Heob")); - - // disable context help button - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); } QString HeobDialog::arguments() const diff --git a/src/plugins/vcsbase/cleandialog.cpp b/src/plugins/vcsbase/cleandialog.cpp index 95495d8ba3..0f358ab1de 100644 --- a/src/plugins/vcsbase/cleandialog.cpp +++ b/src/plugins/vcsbase/cleandialog.cpp @@ -145,7 +145,6 @@ CleanDialog::CleanDialog(QWidget *parent) : d(new Internal::CleanDialogPrivate) { setModal(true); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); d->ui.setupUi(this); d->ui.buttonBox->addButton(tr("Delete..."), QDialogButtonBox::AcceptRole); diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp index 11737ec08b..799ef29faf 100644 --- a/src/plugins/vcsbase/nicknamedialog.cpp +++ b/src/plugins/vcsbase/nicknamedialog.cpp @@ -169,7 +169,6 @@ NickNameDialog::NickNameDialog(QStandardItemModel *model, QWidget *parent) : m_model(model), m_filterModel(new QSortFilterProxyModel(this)) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_ui->setupUi(this); okButton()->setEnabled(false); |