Merge topic 'cmake-gui-osx'

8ced6375 cmake-gui: Shrink spacing between search field and checkbox.
b46a1519 cmake-gui: Change install buttons to activate on clicked instead of pressed.
c19539c5 cmake-gui: Fix install menu to be available for Qt5 builds on OS X.

Source/QtDialog/CMakeSetupDialog.cxx

@@ -119,7 +119,7 @@ CMakeSetupDialog::CMakeSetupDialog()
   QAction* showChangesAction = ToolsMenu->addAction(tr("&Show My Changes"));
   QObject::connect(showChangesAction, SIGNAL(triggered(bool)),
                    this, SLOT(showUserChanges()));
-#if defined(Q_WS_MAC)
+#if defined(Q_WS_MAC) || defined(Q_OS_MAC)
   this->InstallForCommandLineAction
     = ToolsMenu->addAction(tr("&Install For Command Line Use"));
   QObject::connect(this->InstallForCommandLineAction, SIGNAL(triggered(bool)),

Source/QtDialog/CMakeSetupDialog.ui

@@ -134,7 +134,7 @@
            </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>40</width>
+             <width>12</width>
              <height>23</height>
             </size>
            </property>

Source/QtDialog/QMacInstallDialog.cxx

@@ -15,11 +15,11 @@ QMacInstallDialog::QMacInstallDialog(QWidget*w)
 {
   this->Internals = new QMacInstallDialogInternals;
   this->Internals->setupUi(this);
-  QObject::connect(this->Internals->choosePathButton, SIGNAL(pressed()),
+  QObject::connect(this->Internals->choosePathButton, SIGNAL(clicked(bool)),
                    this, SLOT(ShowBrowser()));
-  QObject::connect(this->Internals->skipInstallButton, SIGNAL(pressed()),
+  QObject::connect(this->Internals->skipInstallButton, SIGNAL(clicked(bool)),
                    this, SLOT(SkipInstall()));
-  QObject::connect(this->Internals->doInstallButton, SIGNAL(pressed()),
+  QObject::connect(this->Internals->doInstallButton, SIGNAL(clicked(bool)),
                    this, SLOT(DoInstall()));
   this->Internals->InstallPrefix->setText("/usr/bin/");