This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via c350d78f7baf5db77b808f99911bb07a069da1bf (commit)
via 8ced6375dfd366a088c681e45c0d8cdb4ea04dde (commit)
via b46a15194b7cf1d7aaabf9d0b2a80651ada2e23f (commit)
via c19539c594c4099fd4de68c2e386347d1cb0667f (commit)
from d4506d1708d5da92f5ba26b43262db6d8b0077f9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c350d78f7baf5db77b808f99911bb07a069da1bf
commit c350d78f7baf5db77b808f99911bb07a069da1bf
Merge: d4506d1 8ced637
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Jan 26 11:23:19 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 26 11:23:19 2015 -0500
Merge topic 'cmake-gui-osx' into next
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.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ced6375dfd366a088c681e45c0d8cdb4ea04dde
commit 8ced6375dfd366a088c681e45c0d8cdb4ea04dde
Author: Kevin Wojniak <kain...@kainjow.com>
AuthorDate: Mon Jan 26 07:49:25 2015 -0800
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Jan 26 09:22:21 2015 -0700
cmake-gui: Shrink spacing between search field and checkbox.
This allows the search field to show on OS X Yosemite
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 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>12</width>
<height>23</height>
</size>
</property>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b46a15194b7cf1d7aaabf9d0b2a80651ada2e23f
commit b46a15194b7cf1d7aaabf9d0b2a80651ada2e23f
Author: Kevin Wojniak <kain...@kainjow.com>
AuthorDate: Mon Jan 26 07:48:57 2015 -0800
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Jan 26 09:21:36 2015 -0700
cmake-gui: Change install buttons to activate on clicked instead of pressed.
This matches the behavior of other buttons.
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/");
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c19539c594c4099fd4de68c2e386347d1cb0667f
commit c19539c594c4099fd4de68c2e386347d1cb0667f
Author: Kevin Wojniak <kain...@kainjow.com>
AuthorDate: Mon Jan 26 07:47:57 2015 -0800
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Jan 26 09:20:49 2015 -0700
cmake-gui: Fix install menu to be available for Qt5 builds on OS X.
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)),
-----------------------------------------------------------------------
Summary of changes:
Source/QtDialog/CMakeSetupDialog.cxx | 2 +-
Source/QtDialog/CMakeSetupDialog.ui | 2 +-
Source/QtDialog/QMacInstallDialog.cxx | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
