Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Juku Trump
kdenlive
Commits
f37330ae
Commit
f37330ae
authored
Jan 03, 2019
by
Bhushan Shah
📱
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Applications/18.12'
parents
95de35ea
fb0a66b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
.gitlab-ci.yml
.gitlab-ci.yml
+1
-0
CMakeLists.txt
CMakeLists.txt
+1
-1
src/CMakeLists.txt
src/CMakeLists.txt
+1
-7
No files found.
.gitlab-ci.yml
View file @
f37330ae
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
CMakeLists.txt
View file @
f37330ae
...
...
@@ -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 S
cript S
vg 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
)
...
...
src/CMakeLists.txt
View file @
f37330ae
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment