Merge branch '1.1'

This commit is contained in:
Sergio Martins
2020-10-26 18:23:17 +00:00
2 changed files with 5 additions and 5 deletions

View File

@@ -1,10 +1,10 @@
* v1.3.0 (unreleased, December/January)
- [TODO] QtQuick support
* v1.2.0 (unreleased)
* v1.2.0 (unreleased, November)
- [DONE] Wayland support
* v1.1.0 (unreleased)
* v1.1.0 (26 October 2020)
- New drop indicator style type: Segmented Indicators
- Windows: Drop Shadow for floating windows
- Added AutoHide / SideBar support

View File

@@ -168,13 +168,13 @@ if(CMAKE_COMPILER_IS_GNUCXX OR IS_CLANG_BUILD)
endif()
if(${PROJECT_NAME}_QTQUICK)
target_link_libraries(kddockwidgets PUBLIC Qt5::Widgets Qt5::Quick Qt5::QuickControls2 kddockwidgets_multisplitter PRIVATE Qt5::GuiPrivate)
target_link_libraries(kddockwidgets PUBLIC Qt5::Widgets Qt5::Quick Qt5::QuickControls2 kddockwidgets_multisplitter)
else()
target_link_libraries(kddockwidgets PUBLIC Qt5::Widgets kddockwidgets_multisplitter PRIVATE Qt5::GuiPrivate)
target_link_libraries(kddockwidgets PUBLIC Qt5::Widgets kddockwidgets_multisplitter)
endif()
if (WIN32)
target_link_libraries(kddockwidgets PRIVATE Dwmapi)
target_link_libraries(kddockwidgets PRIVATE Qt5::GuiPrivate Dwmapi)
elseif(NOT APPLE)
find_package(Qt5X11Extras)
target_link_libraries(kddockwidgets PUBLIC Qt5::X11Extras)