[Cmake-commits] CMake branch, next, updated. v2.8.6-2230-g35cb1ce

[Clinton Stimpson]

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  35cb1ce43316532bb4c358e9705fd44d89e7a8ac (commit)
       via  56e04991048ff27e2af1fdcf98fc731ca59280a3 (commit)
       via  0a6543d957463f0a7f7a585cc43468174c1204a0 (commit)
      from  5bcab87427884780041f128f88e37f5faacf0f0c (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=35cb1ce43316532bb4c358e9705fd44d89e7a8ac
commit 35cb1ce43316532bb4c358e9705fd44d89e7a8ac
Merge: 5bcab87 56e0499
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Dec 15 10:52:09 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 15 10:52:09 2011 -0500

    Merge topic 'qtdialog-quit' into next
    
    56e0499 QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
    0a6543d KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56e04991048ff27e2af1fdcf98fc731ca59280a3
commit 56e04991048ff27e2af1fdcf98fc731ca59280a3
Author:     Raphael Kubo da Costa <rakuco at FreeBSD.org>
AuthorDate: Tue Dec 13 21:51:16 2011 -0200
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Dec 15 08:51:50 2011 -0700

    QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
    
    QKeySequence::Quit does not work on all platforms, and since it
    translates to Ctrl+Q on all platforms where it does work, Ctrl+Q was
    hardcoded instead.

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 1c058d3..338eaff 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -26,6 +26,7 @@
 #include <QMimeData>
 #include <QUrl>
 #include <QShortcut>
+#include <QKeySequence>
 #include <QMacInstallDialog.h>
 
 #include "QCMake.h"
@@ -99,6 +100,7 @@ CMakeSetupDialog::CMakeSetupDialog()
   QObject::connect(this->DeleteCacheAction, SIGNAL(triggered(bool)),
                    this, SLOT(doDeleteCache()));
   this->ExitAction = FileMenu->addAction(tr("E&xit"));
+  this->ExitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
   QObject::connect(this->ExitAction, SIGNAL(triggered(bool)),
                    this, SLOT(close()));
 

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeSetupDialog.cxx |    2 ++
 Source/kwsys/kwsysDateStamp.cmake    |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake