From c19539c594c4099fd4de68c2e386347d1cb0667f Mon Sep 17 00:00:00 2001 From: Kevin Wojniak Date: Mon, 26 Jan 2015 07:47:57 -0800 Subject: cmake-gui: Fix install menu to be available for Qt5 builds on OS X. --- Source/QtDialog/CMakeSetupDialog.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 0574681..b8077f2 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/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)), -- cgit v0.12 From b46a15194b7cf1d7aaabf9d0b2a80651ada2e23f Mon Sep 17 00:00:00 2001 From: Kevin Wojniak Date: Mon, 26 Jan 2015 07:48:57 -0800 Subject: cmake-gui: Change install buttons to activate on clicked instead of pressed. This matches the behavior of other buttons. --- Source/QtDialog/QMacInstallDialog.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/QtDialog/QMacInstallDialog.cxx b/Source/QtDialog/QMacInstallDialog.cxx index 8b8c531..fa7df43 100644 --- a/Source/QtDialog/QMacInstallDialog.cxx +++ b/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/"); -- cgit v0.12 From 8ced6375dfd366a088c681e45c0d8cdb4ea04dde Mon Sep 17 00:00:00 2001 From: Kevin Wojniak Date: Mon, 26 Jan 2015 07:49:25 -0800 Subject: cmake-gui: Shrink spacing between search field and checkbox. This allows the search field to show on OS X Yosemite --- Source/QtDialog/CMakeSetupDialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/QtDialog/CMakeSetupDialog.ui b/Source/QtDialog/CMakeSetupDialog.ui index 98da249..b04bd93 100644 --- a/Source/QtDialog/CMakeSetupDialog.ui +++ b/Source/QtDialog/CMakeSetupDialog.ui @@ -134,7 +134,7 @@ - 40 + 12 23 -- cgit v0.12