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 efd253cd1df53b4c3bc3c047253900b59f8d0e33 (commit)
via 1643b6538ee2453088d365cff0705dff039cdf26 (commit)
via 0918f21de2e09ea5f4554a6da7c6d54ac79a2e1a (commit)
from 2b116bd80ea50a46640d701e8f55742250a5cba5 (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=efd253cd1df53b4c3bc3c047253900b59f8d0e33
commit efd253cd1df53b4c3bc3c047253900b59f8d0e33
Merge: 2b116bd 1643b65
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Mar 12 06:36:00 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 12 06:36:00 2013 -0400
Merge topic 'qt5-fixes' into next
1643b65 Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModel.
0918f21 Use -fPIE if required by Qt.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1643b6538ee2453088d365cff0705dff039cdf26
commit 1643b6538ee2453088d365cff0705dff039cdf26
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Mar 12 11:30:59 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Mar 12 11:35:07 2013 +0100
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.
diff --git a/Source/QtDialog/QCMakeCacheView.cxx
b/Source/QtDialog/QCMakeCacheView.cxx
index 1d21d42..c2459d1 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=0918f21de2e09ea5f4554a6da7c6d54ac79a2e1a
commit 0918f21de2e09ea5f4554a6da7c6d54ac79a2e1a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Mar 12 11:23:53 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Mar 12 11:23:53 2013 +0100
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:
Source/QtDialog/CMakeLists.txt | 2 ++
Source/QtDialog/QCMakeCacheView.cxx | 6 +++++-
2 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
