Merge branch '1.4'
This commit is contained in:
@@ -137,6 +137,10 @@ set(DOCKS_INSTALLABLE_PRIVATE_WIDGET_INCLUDES
|
||||
private/widgets/TabWidgetWidget_p.h
|
||||
)
|
||||
|
||||
set(DOCKS_INSTALLABLE_PRIVATE_QUICK_INCLUDES
|
||||
private/quick/QWidgetAdapter_quick_p.h
|
||||
)
|
||||
|
||||
if(${PROJECT_NAME}_QTQUICK)
|
||||
set(DOCKSLIBS_SRCS ${DOCKSLIBS_SRCS}
|
||||
DockWidgetQuick.cpp
|
||||
@@ -337,6 +341,7 @@ install(FILES private/indicators/ClassicIndicators_p.h DESTINATION include/kddoc
|
||||
install(FILES private/indicators/SegmentedIndicators_p.h DESTINATION include/kddockwidgets/private/indicators)
|
||||
|
||||
if(KDDockWidgets_QTQUICK)
|
||||
install(FILES ${DOCKS_INSTALLABLE_PRIVATE_QUICK_INCLUDES} DESTINATION include/kddockwidgets/private/quick)
|
||||
install(FILES private/multisplitter/Separator_quick.h DESTINATION include/kddockwidgets/private/multisplitter)
|
||||
install(FILES private/multisplitter/Widget_quick.h DESTINATION include/kddockwidgets/private/multisplitter)
|
||||
else()
|
||||
|
||||
Reference in New Issue
Block a user