Fix QtQuick build

src/ is no longer in the include path
This commit is contained in:
Sergio Martins
2020-10-28 22:15:32 +00:00
parent ea382dcc17
commit c6c1fe79c3
12 changed files with 26 additions and 14 deletions

View File

@@ -10,9 +10,9 @@
*/
#include "private/DockRegistry_p.h"
#include "private/quick/DockWidgetQuick.h"
#include "Config.h"
#include <kddockwidgets/Config.h>
#include <kddockwidgets/DockWidgetQuick.h>
#include <kddockwidgets/private/DockRegistry_p.h>
#include <QQuickView>
#include <QGuiApplication>

View File

@@ -86,7 +86,7 @@ set(DOCKS_INSTALLABLE_PRIVATE_WIDGET_INCLUDES
if(${PROJECT_NAME}_QTQUICK)
set(DOCKSLIBS_SRCS ${DOCKSLIBS_SRCS}
private/quick/DockWidgetQuick.cpp
DockWidgetQuick.cpp
private/quick/QWidgetAdapter_quick.cpp
private/quick/FloatingWindowQuick.cpp
private/quick/TitleBarQuick.cpp

View File

@@ -33,8 +33,8 @@
# include <QRubberBand>
# include <QToolButton>
#else
# include "DockWidgetQuick.h"
# include "quick/FrameQuick_p.h"
# include "quick/DockWidgetQuick.h"
# include "quick/TitleBarQuick_p.h"
# include "quick/FloatingWindowQuick_p.h"
# include "multisplitter/Separator_quick.h"

View File

@@ -9,4 +9,4 @@
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
#include "../../../private/DragRegistry_p.h"
#include "../../DockWidgetQuick.h"

View File

@@ -0,0 +1,12 @@
/*
This file is part of KDDockWidgets.
SPDX-FileCopyrightText: 2020 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
Author: Sergio Martins <sergio.martins@kdab.com>
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
#include "../../../private/DockRegistry_p.h"

View File

@@ -12,8 +12,8 @@
#ifndef KD_DOCKREGISTRY_P_H
#define KD_DOCKREGISTRY_P_H
#include "DockWidgetBase.h"
#include "MainWindowBase.h"
#include "../DockWidgetBase.h"
#include "../MainWindowBase.h"
#include "FloatingWindow_p.h"
#include <QVector>

View File

@@ -12,11 +12,11 @@
#ifndef KD_FLOATING_WINDOW_P_H
#define KD_FLOATING_WINDOW_P_H
#include "docks_export.h"
#include "../docks_export.h"
#include "../QWidgetAdapter.h"
#include "../LayoutSaver_p.h"
#include "Frame_p.h"
#include "Draggable_p.h"
#include "QWidgetAdapter.h"
#include "LayoutSaver_p.h"
QT_BEGIN_NAMESPACE
class QAbstractNativeEventFilter;

View File

@@ -21,7 +21,7 @@
#ifndef KDDOCKWIDGETS_QWIDGETADAPTERQUICK_P_H
#define KDDOCKWIDGETS_QWIDGETADAPTERQUICK_P_H
#include "docks_export.h"
#include "../../docks_export.h"
#include "Item_p.h"
#include <QQuickItem>

View File

@@ -29,7 +29,7 @@
#include <QApplication>
#ifdef KDDOCKWIDGETS_QTQUICK
# include "quick/DockWidgetQuick.h"
# include "DockWidgetQuick.h"
# include "quick/MainWindowQuick_p.h"
# include <QQmlEngine>

View File

@@ -23,7 +23,7 @@
#include <QtTest/QtTest>
#ifdef KDDOCKWIDGETS_QTQUICK
# include "private/quick/DockWidgetQuick.h"
# include "DockWidgetQuick.h"
# include "private/quick/MainWindowQuick_p.h"
# include <QQuickView>
#else