Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 608b97d9 authored by Michael Palimaka's avatar Michael Palimaka

Remove obsolete QJSON references.

Since f9f8d4b8, QJSON is no longer searched for.
This is because Qt 5 provides native json support.

This obsolete QJSON check was preventing the jabber protocol from being built.
parent 84e99f48
......@@ -79,12 +79,12 @@ if(NOT WIN32)
endif()
if(Qca-qt5_FOUND AND ZLIB_FOUND)
if(IDN_FOUND AND QJSON_FOUND)
if(IDN_FOUND)
if(WITH_jabber)
add_subdirectory( jabber )
endif()
else()
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Jabber because libidn-devel or qjson was not found")
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Jabber because libidn-devel was not found")
endif()
if(WITH_groupwise)
add_subdirectory( groupwise )
......
......@@ -11,7 +11,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/libiris/include/iris
${CMAKE_CURRENT_SOURCE_DIR}/libiris/src
${QCA2_INCLUDE_DIR}
${QJSON_INCLUDE_DIR}
)
if(BUILD_LIBJINGLE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment