From 25d984eb6f801f1fe6e56deaa86ef43c2c1b8f1a Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 29 May 2017 15:38:48 +0200
Subject: [PATCH] CMake: Improve generator setup dialog

Task-number: QTCREATORBUG-18259
Change-Id: I2807fa5f2ca837d4a0026b0aaf13e344221fc702
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp
index a3c0b396df4..7836e6671c7 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitconfigwidget.cpp
@@ -279,11 +279,20 @@ QString CMakeGeneratorKitConfigWidget::toolTip() const
 void CMakeGeneratorKitConfigWidget::changeGenerator()
 {
     QPointer<QDialog> changeDialog = new QDialog(m_changeButton);
+
+    // Disable help button in titlebar on windows:
+    Qt::WindowFlags flags = changeDialog->windowFlags();
+    flags.setFlag(Qt::WindowContextHelpButtonHint, false);
+    flags.setFlag(Qt::MSWindowsFixedSizeDialogHint, true);
+    changeDialog->setWindowFlags(flags);
+
     changeDialog->setWindowTitle(tr("CMake Generator"));
 
     auto *layout = new QGridLayout(changeDialog);
+    layout->setSizeConstraint(QLayout::SetFixedSize);
 
     auto *cmakeLabel = new QLabel;
+    cmakeLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
     auto *generatorCombo = new QComboBox;
     auto *extraGeneratorCombo = new QComboBox;