diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-13 17:34:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-13 17:34:41 (GMT) |
| commit | 0c1621ff950991425b92d21afabed7e5a6cbbfda (patch) | |
| tree | 8d1e89fbc4ba34aa702cd1c5dd90024d5c66fc86 /Source | |
| parent | 8128940ac128c97dbc331c8a0ddb79ebb60a3765 (diff) | |
| parent | 404e1d675ab1359bc79d3631abca911f178afcf4 (diff) | |
| download | CMake-0c1621ff950991425b92d21afabed7e5a6cbbfda.zip CMake-0c1621ff950991425b92d21afabed7e5a6cbbfda.tar.gz CMake-0c1621ff950991425b92d21afabed7e5a6cbbfda.tar.bz2 | |
Merge topic 'qt5-fixes'
404e1d6 cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModel
5144f6f cmake-gui: Use -fPIE if required by Qt.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/QtDialog/QCMakeCacheView.cxx | 6 |
2 files changed, 7 insertions, 1 deletions
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) 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(); } |