From 068797dbb04417f5e9cd25a09d2cb5e9609cb03c Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Wed, 7 Sep 2022 10:56:17 +0200 Subject: [PATCH] Fixed build issues of original pull request --- .../{centralwidget => autohide}/autohide.pro | 3 ++ examples/centralwidget/centralwidget.pro | 34 +++++++++++++++++++ examples/examples.pro | 1 + persist/perspectives.ini | 2 ++ src/DockContainerWidget.cpp | 3 +- src/OverlayDockContainer.cpp | 1 + src/src.pro | 10 ++++-- 7 files changed, 51 insertions(+), 3 deletions(-) rename examples/{centralwidget => autohide}/autohide.pro (95%) create mode 100644 examples/centralwidget/centralwidget.pro create mode 100644 persist/perspectives.ini diff --git a/examples/centralwidget/autohide.pro b/examples/autohide/autohide.pro similarity index 95% rename from examples/centralwidget/autohide.pro rename to examples/autohide/autohide.pro index 824b451..8a00c62 100644 --- a/examples/centralwidget/autohide.pro +++ b/examples/autohide/autohide.pro @@ -23,6 +23,9 @@ SOURCES += \ HEADERS += \ mainwindow.h + +FORMS += \ + mainwindow.ui LIBS += -L$${ADS_OUT_ROOT}/lib include(../../ads.pri) diff --git a/examples/centralwidget/centralwidget.pro b/examples/centralwidget/centralwidget.pro new file mode 100644 index 0000000..738ae78 --- /dev/null +++ b/examples/centralwidget/centralwidget.pro @@ -0,0 +1,34 @@ +ADS_OUT_ROOT = $${OUT_PWD}/../.. + +QT += core gui widgets + +TARGET = CentralWidgetExample +DESTDIR = $${ADS_OUT_ROOT}/lib +TEMPLATE = app +CONFIG += c++14 +CONFIG += debug_and_release +adsBuildStatic { + DEFINES += ADS_STATIC +} + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +SOURCES += \ + main.cpp \ + mainwindow.cpp + +HEADERS += \ + mainwindow.h + +FORMS += \ + mainwindow.ui + +LIBS += -L$${ADS_OUT_ROOT}/lib +include(../../ads.pri) +INCLUDEPATH += ../../src +DEPENDPATH += ../../src + diff --git a/examples/examples.pro b/examples/examples.pro index 3569f37..4e4547a 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS = \ + autohide \ centralwidget \ simple \ hideshow \ diff --git a/persist/perspectives.ini b/persist/perspectives.ini new file mode 100644 index 0000000..e342ad7 --- /dev/null +++ b/persist/perspectives.ini @@ -0,0 +1,2 @@ +[Perspectives] +size=0 diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp index 2e4c25c..ff64c25 100644 --- a/src/DockContainerWidget.cpp +++ b/src/DockContainerWidget.cpp @@ -1508,7 +1508,8 @@ COverlayDockContainer* CDockContainerWidget::createAndInitializeDockWidgetOverla } if (!COverlayDockContainer::areaExistsInConfig(area)) { - assert(false, "Requested area does not exist in config"); + Q_ASSERT_X(false, "CDockContainerWidget::createAndInitializeDockWidgetOverlayContainer", + "Requested area does not exist in config"); return nullptr; } diff --git a/src/OverlayDockContainer.cpp b/src/OverlayDockContainer.cpp index ecf3945..489e96f 100644 --- a/src/OverlayDockContainer.cpp +++ b/src/OverlayDockContainer.cpp @@ -41,6 +41,7 @@ #include #include #include +#include namespace ads { diff --git a/src/src.pro b/src/src.pro index 9f6d265..b400b5e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -47,7 +47,10 @@ HEADERS += \ ElidingLabel.h \ IconProvider.h \ DockComponentsFactory.h \ - DockFocusController.h + DockFocusController.h \ + OverlayDockContainer.h \ + SideTabBar.h \ + DockWidgetSideTab.h SOURCES += \ @@ -67,7 +70,10 @@ SOURCES += \ ElidingLabel.cpp \ IconProvider.cpp \ DockComponentsFactory.cpp \ - DockFocusController.cpp + DockFocusController.cpp \ + OverlayDockContainer.cpp \ + SideTabBar.cpp \ + DockWidgetSideTab.cpp unix:!macx {