diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5dd9a93dc51cfadacb22071d28522d021f14570c..a2187790882824a6642041fa5a0432273f82f355 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,4 @@ 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-applications-linux.yml + - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-freebsd.yml diff --git a/CMakeLists.txt b/CMakeLists.txt index 6955c0748f276e0d2ff8980f11f1176b9e53bfaa..e5c54d57d053d90b86d02e1e0ea6394bd117dbbf 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 Concurrent) +find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Svg Quick Concurrent) find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET) find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 33a9833b0a61d4a4beea3364b055cbf43f9ea1f2..d383418ac5b5e4f20885e7a44d1e2d1cd8ad67ba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -63,12 +63,6 @@ set_package_properties(OpenGL PROPERTIES TYPE RUNTIME 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) # macro_log_feature(SDL_FOUND # "SDL" @@ -292,7 +286,7 @@ elseif (KF5Crash_FOUND) target_link_libraries(kdenlive KF5::Crash) 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) add_definitions(-DKF5_USE_PURPOSE)