Merge pull request #16 from sgaist/various_fixes

Various fixes
This commit is contained in:
githubuser0xFFFF 2019-01-15 19:29:32 +01:00 committed by GitHub
commit 4fa89374c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 9 deletions

8
.gitignore vendored
View File

@ -1,2 +1,10 @@
*.pro.user
/ build
*.o
*.dylib
*.app
qrc_*
moc_*
ui_*
Makefile

View File

@ -1,7 +1,9 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = \
src \
demo \
example
demo.depends = src
example.depends = src

View File

@ -57,7 +57,6 @@
#include "DockManager.h"
#include "DockWidget.h"
#include "DockAreaWidget.h"
#include "AnimatedLabel.h"
//============================================================================

View File

@ -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 <http://www.gnu.org/licenses/>.
******************************************************************************/
@ -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

View File

@ -131,7 +131,7 @@ public:
bool isClosable() const;
public slots:
virtual void setVisible(bool visible);
virtual void setVisible(bool visible) override;
signals:
void activeTabChanged();