kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2015-01-27 11:22:01 -05:00 committed by CMake Topic Stage
parent ef6d030c95 8ced6375df
commit d1b3370d52
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/QtDialog/CMakeSetupDialog.cxx
View File

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

2
Source/QtDialog/CMakeSetupDialog.ui
View File

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

6
Source/QtDialog/QMacInstallDialog.cxx
View File

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