Commit f37330ae authored by Bhushan Shah's avatar Bhushan Shah 📱

Merge branch 'Applications/18.12'

parents 95de35ea fb0a66b0
include: include:
- https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml
- https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml
- https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-freebsd.yml
...@@ -78,7 +78,7 @@ include(CheckIncludeFiles) ...@@ -78,7 +78,7 @@ include(CheckIncludeFiles)
check_include_files(malloc.h HAVE_MALLOC_H) check_include_files(malloc.h HAVE_MALLOC_H)
check_include_files(pthread.h HAVE_PTHREAD_H) check_include_files(pthread.h HAVE_PTHREAD_H)
find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick Concurrent) find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Svg Quick Concurrent)
find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET) find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET) find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
......
...@@ -63,12 +63,6 @@ set_package_properties(OpenGL PROPERTIES ...@@ -63,12 +63,6 @@ set_package_properties(OpenGL PROPERTIES
TYPE RUNTIME TYPE RUNTIME
PURPOSE "") PURPOSE "")
set_package_properties(QtScript PROPERTIES
DESCRIPTION "Qt module providing core scripting facilities"
URL "http://qt.nokia.com/products/qt"
TYPE RUNTIME
PURPOSE "")
#if(APPLE) #if(APPLE)
# macro_log_feature(SDL_FOUND # macro_log_feature(SDL_FOUND
# "SDL" # "SDL"
...@@ -292,7 +286,7 @@ elseif (KF5Crash_FOUND) ...@@ -292,7 +286,7 @@ elseif (KF5Crash_FOUND)
target_link_libraries(kdenlive KF5::Crash) target_link_libraries(kdenlive KF5::Crash)
endif(DRMINGW_FOUND) endif(DRMINGW_FOUND)
target_link_libraries(kdenlive Qt5::Script Qt5::Widgets Qt5::Concurrent Qt5::Qml Qt5::Quick) target_link_libraries(kdenlive Qt5::Widgets Qt5::Concurrent Qt5::Qml Qt5::Quick)
if (KF5_PURPOSE) if (KF5_PURPOSE)
add_definitions(-DKF5_USE_PURPOSE) add_definitions(-DKF5_USE_PURPOSE)
......
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