Commit c595018a authored by Andreas Sturmlechner's avatar Andreas Sturmlechner

Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)

Summary:
A change in Qt 5.11_beta3 leads to errors like:

CMake Error at renderer/CMakeLists.txt:12 (qt5_use_modules):
  `Unknown CMake command "qt5_use_modules".`

Test Plan: Built fine.

Reviewers: #kdenlive, mardelle

Reviewed By: #kdenlive, mardelle

Differential Revision: https://phabricator.kde.org/D12184
parent ddc1dba8
......@@ -78,7 +78,7 @@ include(CheckIncludeFiles)
check_include_files(malloc.h HAVE_MALLOC_H)
check_include_files(pthread.h HAVE_PTHREAD_H)
find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick )
find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick Concurrent)
find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
......
......@@ -9,12 +9,6 @@ set(kdenlive_render_SRCS
add_executable(kdenlive_render ${kdenlive_render_SRCS})
ecm_mark_nongui_executable(kdenlive_render)
qt5_use_modules(kdenlive_render Widgets Concurrent DBus)
target_link_libraries(kdenlive_render
${QT_LIBRARIES}
${Qt5_LIBRARIES}
)
target_link_libraries(kdenlive_render Qt5::Core Qt5::DBus)
install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR})
......@@ -299,7 +299,7 @@ if (KF5Crash_FOUND)
target_link_libraries(kdenlive KF5::Crash)
endif()
qt5_use_modules( kdenlive Script Widgets Concurrent Qml Quick)
target_link_libraries(kdenlive Qt5::Script Qt5::Widgets Qt5::Concurrent Qt5::Qml Qt5::Quick)
if (Qt5WebKitWidgets_FOUND)
message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org credentials to download files")
......
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