Skip to content
Permalink
Browse files

Fix QtWebKit automagic

  • Loading branch information
a17r authored and m-kuhn committed Feb 24, 2017
1 parent f1379e8 commit af73eea363072818dd4d30d5c2a643897c5daf7c
@@ -288,6 +288,10 @@ ELSE()
MESSAGE(STATUS "Found Qt version: ${QTVERSION}")
ENDIF()

IF(WITH_QTWEBKIT)
SET(OPTIONAL_QTWEBKIT ${QT_QTWEBKIT_LIBRARY})
ENDIF(WITH_QTWEBKIT)

IF (WITH_QTMOBILITY)
FIND_PACKAGE(QtMobility 1.1.0)
ENDIF (WITH_QTMOBILITY)
@@ -609,7 +609,7 @@ TARGET_LINK_LIBRARIES(qgis_app
${QWT_LIBRARY}
${QT_QTSQL_LIBRARY}
${QT_QTUITOOLS_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${OPTIONAL_QTWEBKIT}
#should only be needed for win
${QT_QTMAIN_LIBRARY}
${QWTPOLAR_LIBRARY}
@@ -80,7 +80,7 @@ TARGET_LINK_LIBRARIES(qbrowser
${QT_QTNETWORK_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${OPTIONAL_QTWEBKIT}
${QT_QTMAIN_LIBRARY}
${SQLITE3_LIBRARY}
)
@@ -981,7 +981,7 @@ TARGET_LINK_LIBRARIES(qgis_core
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${OPTIONAL_QTWEBKIT}
${QT_QTSQL_LIBRARY}
${QCA_LIBRARY}

@@ -68,7 +68,7 @@ TARGET_LINK_LIBRARIES(qgis_help
${QT_QTNETWORK_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${OPTIONAL_QTWEBKIT}
${QT_QTMAIN_LIBRARY}
${SQLITE3_LIBRARY}
)
@@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(qgis_bench
${QT_QTNETWORK_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${OPTIONAL_QTWEBKIT}
${QT_QTMAIN_LIBRARY}
${QT_QTTEST_LIBRARY}
)
@@ -102,7 +102,7 @@ MACRO (ADD_QGIS_TEST testname testsrc)
${QT_QTSVG_LIBRARY}
${QT_QTTEST_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${OPTIONAL_QTWEBKIT}
${QT_QTMAIN_LIBRARY}
${PROJ_LIBRARY}
${GEOS_LIBRARY}
@@ -124,7 +124,7 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug)
${QT_QTNETWORK_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${OPTIONAL_QTWEBKIT}
${QT_QTMAIN_LIBRARY}
${QT_QTSCRIPT_LIBRARY}
qgis_core

0 comments on commit af73eea

Please sign in to comment.
You can’t perform that action at this time.