mirror of
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
synced 2024-11-15 13:15:43 +08:00
Fixed build issues of original pull request
This commit is contained in:
parent
302fcd1435
commit
068797dbb0
@ -24,6 +24,9 @@ SOURCES += \
|
|||||||
HEADERS += \
|
HEADERS += \
|
||||||
mainwindow.h
|
mainwindow.h
|
||||||
|
|
||||||
|
FORMS += \
|
||||||
|
mainwindow.ui
|
||||||
|
|
||||||
LIBS += -L$${ADS_OUT_ROOT}/lib
|
LIBS += -L$${ADS_OUT_ROOT}/lib
|
||||||
include(../../ads.pri)
|
include(../../ads.pri)
|
||||||
INCLUDEPATH += ../../src
|
INCLUDEPATH += ../../src
|
34
examples/centralwidget/centralwidget.pro
Normal file
34
examples/centralwidget/centralwidget.pro
Normal file
@ -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
|
||||||
|
|
@ -1,6 +1,7 @@
|
|||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
|
autohide \
|
||||||
centralwidget \
|
centralwidget \
|
||||||
simple \
|
simple \
|
||||||
hideshow \
|
hideshow \
|
||||||
|
2
persist/perspectives.ini
Normal file
2
persist/perspectives.ini
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[Perspectives]
|
||||||
|
size=0
|
@ -1508,7 +1508,8 @@ COverlayDockContainer* CDockContainerWidget::createAndInitializeDockWidgetOverla
|
|||||||
}
|
}
|
||||||
if (!COverlayDockContainer::areaExistsInConfig(area))
|
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;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,6 +41,7 @@
|
|||||||
#include <QBoxLayout>
|
#include <QBoxLayout>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QSplitter>
|
#include <QSplitter>
|
||||||
|
#include <QPointer>
|
||||||
|
|
||||||
namespace ads
|
namespace ads
|
||||||
{
|
{
|
||||||
|
10
src/src.pro
10
src/src.pro
@ -47,7 +47,10 @@ HEADERS += \
|
|||||||
ElidingLabel.h \
|
ElidingLabel.h \
|
||||||
IconProvider.h \
|
IconProvider.h \
|
||||||
DockComponentsFactory.h \
|
DockComponentsFactory.h \
|
||||||
DockFocusController.h
|
DockFocusController.h \
|
||||||
|
OverlayDockContainer.h \
|
||||||
|
SideTabBar.h \
|
||||||
|
DockWidgetSideTab.h
|
||||||
|
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
@ -67,7 +70,10 @@ SOURCES += \
|
|||||||
ElidingLabel.cpp \
|
ElidingLabel.cpp \
|
||||||
IconProvider.cpp \
|
IconProvider.cpp \
|
||||||
DockComponentsFactory.cpp \
|
DockComponentsFactory.cpp \
|
||||||
DockFocusController.cpp
|
DockFocusController.cpp \
|
||||||
|
OverlayDockContainer.cpp \
|
||||||
|
SideTabBar.cpp \
|
||||||
|
DockWidgetSideTab.cpp
|
||||||
|
|
||||||
|
|
||||||
unix:!macx {
|
unix:!macx {
|
||||||
|
Loading…
Reference in New Issue
Block a user