[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2490-g872df5e

[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  872df5e67bd7a220b796c92e4d4046370287f2f7 (commit)
       via  404e1d675ab1359bc79d3631abca911f178afcf4 (commit)
       via  5144f6fb1121492d963c9a266650d219ee7eccc3 (commit)
      from  a1338fd5b46f6218bbd3afe3fa6663689bc88038 (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=872df5e67bd7a220b796c92e4d4046370287f2f7
commit 872df5e67bd7a220b796c92e4d4046370287f2f7
Merge: a1338fd 404e1d6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 18:43:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 12 18:43:16 2013 -0400

    Merge topic 'qt5-fixes' into next
    
    404e1d6 cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModel
    5144f6f cmake-gui: Use -fPIE if required by Qt.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=404e1d675ab1359bc79d3631abca911f178afcf4
commit 404e1d675ab1359bc79d3631abca911f178afcf4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 12 11:30:59 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 12 18:41:26 2013 -0400

    cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModel
    
    The commit in qtbase 9dfba89c (Add implementations of QAIM::sibling in
    public APIs., 2012-09-26) added a buggy implementation of sibling(), and
    the commit f136701b (Use the base implementation of
    QAbstractItemModel::sibling in QSIM., 2013-02-21) resolves it.
    Workaround the bug for Qt releases that have it.

diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index 1d21d42..031350b 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -490,7 +490,11 @@ QCMakePropertyList QCMakeCacheModel::properties() const
       }
 
       // go to the next in the tree
-      while(!idxs.isEmpty() && !idxs.last().sibling(idxs.last().row()+1, 0).isValid())
+      while(!idxs.isEmpty() && (
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 3)
+        (idxs.last().row()+1) >= rowCount(idxs.last().parent()) ||
+#endif
+        !idxs.last().sibling(idxs.last().row()+1, 0).isValid()))
       {
         idxs.removeLast();
       }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5144f6fb1121492d963c9a266650d219ee7eccc3
commit 5144f6fb1121492d963c9a266650d219ee7eccc3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 12 11:23:53 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 12 18:41:15 2013 -0400

    cmake-gui: Use -fPIE if required by Qt.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 29daffd..1684fb2 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -27,6 +27,8 @@ if (Qt5Widgets_FOUND)
   set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
   # Remove this when the minimum version of Qt is 4.6.
   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
+
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 else()
   set(QT_MIN_VERSION "4.4.0")
   find_package(Qt4 REQUIRED)

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

Summary of changes:


hooks/post-receive
-- 
CMake