[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/18.04] /: Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
From:       Andreas Sturmlechner <null () kde ! org>
Date:       2018-04-20 7:46:46
Message-ID: E1f9Qko-0006nB-B1 () code ! kde ! org
[Download RAW message or body]

Git commit c595018a420127fb1cd2af6b676554f9960c7f79 by Andreas Sturmlechner.
Committed on 20/04/2018 at 07:46.
Pushed by asturmlechner into branch 'Applications/18.04'.

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

M  +1    -1    CMakeLists.txt
M  +1    -7    renderer/CMakeLists.txt
M  +1    -1    src/CMakeLists.txt

https://commits.kde.org/kdenlive/c595018a420127fb1cd2af6b676554f9960c7f79

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79716d24c..68c699f64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 Co=
ncurrent)
 find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
 =

 find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt
index 27f5f4367..e96ed0d83 100644
--- a/renderer/CMakeLists.txt
+++ b/renderer/CMakeLists.txt
@@ -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})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b3cbdea9..2ba81bb48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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 Qt=
5::Qml Qt5::Quick)
 =

 if (Qt5WebKitWidgets_FOUND)
     message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.or=
g credentials to download files")
[prev in list] [next in list] [prev in thread] [next in thread]