diff --git a/.gitignore b/.gitignore index fc33dca..96312f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,10 @@ *.pro.user / build +*.o +*.dylib +*.app +qrc_* +moc_* +ui_* +Makefile + diff --git a/ads.pro b/ads.pro index 63d1887..b798785 100644 --- a/ads.pro +++ b/ads.pro @@ -1,7 +1,9 @@ TEMPLATE = subdirs -CONFIG += ordered SUBDIRS = \ src \ demo \ example + +demo.depends = src +example.depends = src diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp index 99c1e6f..e547916 100644 --- a/demo/MainWindow.cpp +++ b/demo/MainWindow.cpp @@ -57,7 +57,6 @@ #include "DockManager.h" #include "DockWidget.h" #include "DockAreaWidget.h" -#include "AnimatedLabel.h" //============================================================================ diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp index b065cf1..5e05f36 100644 --- a/src/DockAreaWidget.cpp +++ b/src/DockAreaWidget.cpp @@ -1,17 +1,17 @@ /******************************************************************************* ** Qt Advanced Docking System ** Copyright (C) 2017 Uwe Kindler -** +** ** This library is free software; you can redistribute it and/or ** modify it under the terms of the GNU Lesser General Public ** License as published by the Free Software Foundation; either ** version 2.1 of the License, or (at your option) any later version. -** +** ** This library is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** Lesser General Public License for more details. -** +** ** You should have received a copy of the GNU Lesser General Public ** License along with this library; If not, see . ******************************************************************************/ @@ -61,9 +61,6 @@ namespace ads { static const char* const INDEX_PROPERTY = "index"; static const char* const ACTION_PROPERTY = "action"; -static const char* const DOCKWIDGET_PROPERTY = "dockwidget"; -static const int APPEND = -1; - /** * New dock area layout mimics stack layout but only inserts the current diff --git a/src/DockWidgetTab.h b/src/DockWidgetTab.h index 692d940..c72f2df 100644 --- a/src/DockWidgetTab.h +++ b/src/DockWidgetTab.h @@ -131,7 +131,7 @@ public: bool isClosable() const; public slots: - virtual void setVisible(bool visible); + virtual void setVisible(bool visible) override; signals: void activeTabChanged();