Skip to content

Commit a081f9d

Browse files
authored
Merge pull request #45 from eric-h/qt56-support-patched-6
added qt 5.6 support by removing dependencies to webkit on versions >…
2 parents 56550e4 + abeac25 commit a081f9d

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,15 @@ set(minimum_required_qt_version ${minimum_required_qt${PythonQt_QT_VERSION}_vers
4343
set(qt5libs Core Widgets Network OpenGL Sql Svg UiTools WebKitWidgets Xml XmlPatterns)
4444
set(qt4libs core gui network opengl sql svg uitools webkit xml xmlpatterns)
4545
set(qtlibs ${qt${PythonQt_QT_VERSION}libs})
46-
46+
47+
# Webkit need to be removed Qt >= 5.6
48+
if(PythonQt_QT_VERSION MATCHES 5)
49+
find_package(Qt5 ${minimum_required_qt5_version} COMPONENTS Core REQUIRED)
50+
if(${Qt5Core_VERSION_MINOR} GREATER 5)
51+
list(REMOVE_ITEM qtlibs WebKitWidgets)
52+
list(REMOVE_ITEM qt4libs webkit)
53+
endif()
54+
endif()
4755
#-----------------------------------------------------------------------------
4856
# Python libraries
4957

0 commit comments

Comments
 (0)