[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-267-g59e6bc2

[Brad King]

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  59e6bc2cb25956eabefc11bb1a50952a4078dc71 (commit)
       via  1594edba9ead291eaf3a9b4e63ba41edc43d4f99 (commit)
      from  f286bc11e75e18b11c3625e85bae4fc6f61c5ef0 (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=59e6bc2cb25956eabefc11bb1a50952a4078dc71
commit 59e6bc2cb25956eabefc11bb1a50952a4078dc71
Merge: f286bc1 1594edb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 8 16:37:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 8 16:37:11 2015 -0400

    Merge topic 'binary-release-osx-qt-4.8-update' into next
    
    1594edba Utilities/Release: Update to more recent Qt 4.8 on OS X


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1594edba9ead291eaf3a9b4e63ba41edc43d4f99
commit 1594edba9ead291eaf3a9b4e63ba41edc43d4f99
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 8 11:28:35 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 8 16:36:06 2015 -0400

    Utilities/Release: Update to more recent Qt 4.8 on OS X
    
    Update to a version newer than 4.8.0 to get the fix for this issue:
    
     https://bugreports.qt.io/browse/QTBUG-23704
     https://codereview.qt-project.org/13576
     http://code.qt.io/cgit/qt/qt.git/commit/?id=e88dbaa7fc
    
    We hit it in the cmake-gui command-line install help dialog.

diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index bc95982..b407554 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -20,7 +20,7 @@ CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CPACK_SYSTEM_NAME:STRING=Darwin-x86_64
 BUILD_QtDialog:BOOL=TRUE
 CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
-QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.0/install/bin/qmake
+QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.6/install/bin/qmake
 ")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(${path}/release_cmake.cmake)

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

Summary of changes:
 Utilities/Release/dashmacmini5_release.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake