Squashed commit of the following:
commit 60c0f65c5e3c2faf1f7b0ae10b4131dabbcf715b
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Wed Feb 15 22:34:16 2023 -0800
mainwindow: don't close last timeline panel when removing sequence
commit bc892810d67c1dd4f9c0639767c563681f29701d
Merge: 69051a120 aef08f8cd
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue Feb 14 17:05:25 2023 -0800
Merge branch 'master' into kddockwidgets
commit 69051a120b8423d0ad7b38def2f7555d323cd74d
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue Feb 14 15:29:24 2023 -0800
finished kddockwidgets integration
commit 9a39dbeade871a0b9454b424c7f7a7482671d40b
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue Feb 14 11:54:25 2023 -0800
switch to kddockwidgets
This commit is contained in:
@@ -150,8 +150,18 @@ if (${QT_VERSION_MAJOR} EQUAL "6")
|
||||
list(APPEND OLIVE_LIBRARIES
|
||||
Qt${QT_VERSION_MAJOR}::OpenGLWidgets
|
||||
)
|
||||
|
||||
# Link KDDockWidgets
|
||||
find_package(KDDockWidgets-qt6 CONFIG REQUIRED)
|
||||
else()
|
||||
# Link KDDockWidgets
|
||||
find_package(KDDockWidgets CONFIG REQUIRED)
|
||||
endif()
|
||||
|
||||
list(APPEND OLIVE_LIBRARIES
|
||||
KDAB::kddockwidgets
|
||||
)
|
||||
|
||||
# Link FFmpeg
|
||||
find_package(FFMPEG 3.0 REQUIRED
|
||||
COMPONENTS
|
||||
|
||||
Reference in New Issue
Block a user