Skip to content

added qt 5.6 support by removing dependencies to webkit on versions >… #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2016
Merged

added qt 5.6 support by removing dependencies to webkit on versions >… #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,15 @@ set(minimum_required_qt_version ${minimum_required_qt${PythonQt_QT_VERSION}_vers
set(qt5libs Core Widgets Network OpenGL Sql Svg UiTools WebKitWidgets Xml XmlPatterns)
set(qt4libs core gui network opengl sql svg uitools webkit xml xmlpatterns)
set(qtlibs ${qt${PythonQt_QT_VERSION}libs})


# Webkit need to be removed Qt >= 5.6
if(PythonQt_QT_VERSION MATCHES 5)
find_package(Qt5 ${minimum_required_qt5_version} COMPONENTS Core REQUIRED)
if(${Qt5Core_VERSION_MINOR} GREATER 5)
list(REMOVE_ITEM qtlibs WebKitWidgets)
list(REMOVE_ITEM qt4libs webkit)
endif()
endif()
#-----------------------------------------------------------------------------
# Python libraries

Expand Down