137 lines
4.1 KiB
Diff
137 lines
4.1 KiB
Diff
From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
|
|
From: David Faure <faure@kde.org>
|
|
Date: Tue, 3 Apr 2018 00:31:19 +0200
|
|
Subject: Fix compilation with Qt 5.11 (missing include)
|
|
|
|
---
|
|
stage/part/KPrPresentationTool.cpp | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
|
|
index ae743da..3007f91 100644
|
|
--- stage/part/KPrPresentationTool.cpp
|
|
+++ stage/part/KPrPresentationTool.cpp
|
|
@@ -32,6 +32,7 @@
|
|
#include <QDesktopServices>
|
|
#include <QUrl>
|
|
#include <QDBusConnection>
|
|
+#include <QFrame>
|
|
|
|
#include <KoShape.h>
|
|
#include <KoShapeManager.h>
|
|
---
|
|
From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
|
Date: Sun, 18 Mar 2018 11:56:57 +0100
|
|
Subject: Fix build with Qt 5.11 (missing headers)
|
|
|
|
Reviewers: #calligra:_3.0, anthonyfieroni, danders
|
|
|
|
Reviewed By: #calligra:_3.0, anthonyfieroni, danders
|
|
|
|
Subscribers: anthonyfieroni, danders
|
|
|
|
Tags: #calligra:_3.0
|
|
|
|
Differential Revision: https://phabricator.kde.org/D11454
|
|
---
|
|
libs/widgets/KoCsvImportDialog.cpp | 1 +
|
|
libs/widgets/KoPageLayoutWidget.cpp | 2 ++
|
|
plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 +
|
|
plugins/formulashape/FormulaToolWidget.cpp | 1 +
|
|
sheets/dialogs/LayoutDialog.cpp | 1 +
|
|
words/part/dialogs/KWAnchoringProperties.cpp | 1 +
|
|
words/part/dialogs/KWRunAroundProperties.cpp | 2 ++
|
|
15 files changed, 18 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
|
|
index 0ffdcf6..cdca006 100644
|
|
--- libs/widgets/KoCsvImportDialog.cpp
|
|
+++ libs/widgets/KoCsvImportDialog.cpp
|
|
@@ -21,6 +21,7 @@
|
|
#include "KoCsvImportDialog.h"
|
|
|
|
// Qt
|
|
+#include <QButtonGroup>
|
|
#include <QTextCodec>
|
|
#include <QTextStream>
|
|
|
|
diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
|
|
index f91555c..a3816f9 100644
|
|
--- libs/widgets/KoPageLayoutWidget.cpp
|
|
+++ libs/widgets/KoPageLayoutWidget.cpp
|
|
@@ -23,6 +23,8 @@
|
|
|
|
#include <KoUnit.h>
|
|
|
|
+#include <QButtonGroup>
|
|
+
|
|
class Q_DECL_HIDDEN KoPageLayoutWidget::Private
|
|
{
|
|
public:
|
|
diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
|
|
index c0d5136..d2a772e 100644
|
|
--- plugins/chartshape/dialogs/TableEditorDialog.cpp
|
|
+++ plugins/chartshape/dialogs/TableEditorDialog.cpp
|
|
@@ -24,6 +24,7 @@
|
|
|
|
// Qt
|
|
#include <QAbstractItemModel>
|
|
+#include <QAction>
|
|
|
|
// Calligra
|
|
#include <KoIcon.h>
|
|
diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
|
|
index ed10919..8f52177 100644
|
|
--- plugins/formulashape/FormulaToolWidget.cpp
|
|
+++ plugins/formulashape/FormulaToolWidget.cpp
|
|
@@ -30,6 +30,7 @@
|
|
#include <QWidgetAction>
|
|
#include <QTableWidget>
|
|
#include <QAction>
|
|
+#include <QHeaderView>
|
|
#include <QMenu>
|
|
|
|
FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
|
|
diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
|
|
index a0a9832..7d7db53 100644
|
|
--- sheets/dialogs/LayoutDialog.cpp
|
|
+++ sheets/dialogs/LayoutDialog.cpp
|
|
@@ -36,6 +36,7 @@
|
|
#include <math.h>
|
|
|
|
#include <QIntValidator>
|
|
+#include <QButtonGroup>
|
|
#include <QCheckBox>
|
|
#include <QFrame>
|
|
#include <QLabel>
|
|
diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
|
|
index d64208c..bfddb3a 100644
|
|
--- words/part/dialogs/KWAnchoringProperties.cpp
|
|
+++ words/part/dialogs/KWAnchoringProperties.cpp
|
|
@@ -35,6 +35,7 @@
|
|
|
|
#include <kundo2command.h>
|
|
|
|
+#include <QButtonGroup>
|
|
#include <QComboBox>
|
|
|
|
const int KWAnchoringProperties::vertRels[4][20] = {
|
|
diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
|
|
index e38599a..7e8b2d5 100644
|
|
--- words/part/dialogs/KWRunAroundProperties.cpp
|
|
+++ words/part/dialogs/KWRunAroundProperties.cpp
|
|
@@ -28,6 +28,8 @@
|
|
|
|
#include <kundo2command.h>
|
|
|
|
+#include <QButtonGroup>
|
|
+
|
|
KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
|
|
: m_state(state)
|
|
{
|
|
--
|
|
cgit v0.11.2
|
|
|
|
|