Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
eea417cb
Commit
eea417cb
authored
Jan 31, 2020
by
Jean-Baptiste Mardelle
Browse files
Add dependency on QtQuickControls2 to correctly style timeline controls
parent
0fb7ba92
Pipeline
#14257
canceled with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
eea417cb
...
...
@@ -57,7 +57,7 @@ find_package(KF5 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigW
# Qt
set
(
QT_MIN_VERSION 5.11.0
)
find_package
(
Qt5 REQUIRED COMPONENTS Core DBus Widgets Svg Quick Concurrent QuickWidgets Multimedia
)
find_package
(
Qt5 REQUIRED COMPONENTS Core DBus Widgets Svg Quick
QuickControls2
Concurrent QuickWidgets Multimedia
)
add_definitions
(
-DQT_NO_CAST_TO_ASCII -DQT_NO_URL_CAST_FROM_STRING
)
set
(
DEFAULT_CXX_FLAGS
"
${
DEFAULT_CXX_FLAGS
}
${
Qt5Widgets_EXECUTABLE_COMPILE_FLAGS
}
"
)
...
...
src/CMakeLists.txt
View file @
eea417cb
...
...
@@ -131,6 +131,7 @@ target_link_libraries(kdenliveLib
KF5::Solid
Qt5::Svg
Qt5::Quick
Qt5::QuickControls2
Qt5::QuickWidgets
Qt5::Concurrent
Qt5::Multimedia
...
...
src/core.cpp
View file @
eea417cb
...
...
@@ -36,7 +36,7 @@ the Free Software Foundation, either version 3 of the License, or
#include
<QCoreApplication>
#include
<QInputDialog>
#include
<QDir>
#include
<QQuickStyle>
#include
<locale>
#ifdef Q_OS_MAC
#include
<xlocale.h>
...
...
@@ -127,6 +127,13 @@ void Core::initGUI(const QUrl &Url, const QString &clipsToLoad)
m_currentProfile
=
m_profile
;
profileChanged
();
m_mainWindow
=
new
MainWindow
();
QStringList
styles
=
QQuickStyle
::
availableStyles
();
if
(
styles
.
contains
(
QLatin1String
(
"org.kde.desktop"
)))
{
QQuickStyle
::
setStyle
(
"org.kde.desktop"
);
}
else
if
(
styles
.
contains
(
QLatin1String
(
"Fusion"
)))
{
QQuickStyle
::
setStyle
(
"Fusion"
);
}
connect
(
this
,
&
Core
::
showConfigDialog
,
m_mainWindow
,
&
MainWindow
::
slotPreferences
);
// load default profile and ask user to select one if not found.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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