Merge topic 'qt5-fixes'
404e1d6
cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModel5144f6f
cmake-gui: Use -fPIE if required by Qt.
This commit is contained in:
commit
0c1621ff95
|
@ -27,6 +27,8 @@ if (Qt5Widgets_FOUND)
|
||||||
set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
|
set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
|
||||||
# Remove this when the minimum version of Qt is 4.6.
|
# Remove this when the minimum version of Qt is 4.6.
|
||||||
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
|
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
|
||||||
|
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
|
||||||
else()
|
else()
|
||||||
set(QT_MIN_VERSION "4.4.0")
|
set(QT_MIN_VERSION "4.4.0")
|
||||||
find_package(Qt4 REQUIRED)
|
find_package(Qt4 REQUIRED)
|
||||||
|
|
|
@ -490,7 +490,11 @@ QCMakePropertyList QCMakeCacheModel::properties() const
|
||||||
}
|
}
|
||||||
|
|
||||||
// go to the next in the tree
|
// 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();
|
idxs.removeLast();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue