From 1b5ac6b603626d26dbb3484ae4cb7624cb18a620 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 14 Jan 2020 01:57:58 +0000 Subject: user/*: Modernise / fix syntax / deps / code --- user/calligra/qt5.patch | 293 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 293 insertions(+) create mode 100644 user/calligra/qt5.patch (limited to 'user/calligra/qt5.patch') diff --git a/user/calligra/qt5.patch b/user/calligra/qt5.patch new file mode 100644 index 000000000..a40d92127 --- /dev/null +++ b/user/calligra/qt5.patch @@ -0,0 +1,293 @@ +From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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 ++ + plan/src/kptview.h | 1 + + plan/src/kptviewlist.cpp | 1 + + plan/src/libs/ui/kptaccountseditor.cpp | 1 + + plan/src/libs/ui/kptdocumentspanel.h | 1 + + plan/src/libs/ui/kptitemviewsettup.cpp | 2 +- + plan/src/libs/ui/kpttaskeditor.cpp | 1 + + plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + + plan/src/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 +--- a/libs/widgets/KoCsvImportDialog.cpp ++++ b/libs/widgets/KoCsvImportDialog.cpp +@@ -21,6 +21,7 @@ + #include "KoCsvImportDialog.h" + + // Qt ++#include + #include + #include + +diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp +index f91555c..a3816f9 100644 +--- a/libs/widgets/KoPageLayoutWidget.cpp ++++ b/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include + ++#include ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +diff --git a/plan/src/kptview.h b/plan/src/kptview.h +index 44d1193..a98e553 100644 +--- a/plan/src/kptview.h ++++ b/plan/src/kptview.h +@@ -28,6 +28,7 @@ + #include "kptcontext.h" + #include "kptviewbase.h" + ++#include + #include + #include + +diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp +index f34e702..0e6db7b 100644 +--- a/plan/src/kptviewlist.cpp ++++ b/plan/src/kptviewlist.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp +index 7991faf..54e3a87 100644 +--- a/plan/src/libs/ui/kptaccountseditor.cpp ++++ b/plan/src/libs/ui/kptaccountseditor.cpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #include + #include +diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h +index 00ea3af..491cb1e 100644 +--- a/plan/src/libs/ui/kptdocumentspanel.h ++++ b/plan/src/libs/ui/kptdocumentspanel.h +@@ -26,6 +26,7 @@ + + #include "kptdocuments.h" + ++#include + #include + #include + +diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp +index d1c3b1f..7c97a07 100644 +--- a/plan/src/libs/ui/kptitemviewsettup.cpp ++++ b/plan/src/libs/ui/kptitemviewsettup.cpp +@@ -25,9 +25,9 @@ + + #include "KoPageLayoutWidget.h" + ++#include + #include + +- + namespace KPlato + { + +diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp +index 2154611..91db5ac 100644 +--- a/plan/src/libs/ui/kpttaskeditor.cpp ++++ b/plan/src/libs/ui/kpttaskeditor.cpp +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include + + #include +diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp +index 344ebc2..9146f06 100644 +--- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp ++++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp +@@ -31,6 +31,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp +index c9e17b7..b67e984 100644 +--- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp ++++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include + ++#include ++ + 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 +--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp ++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp +@@ -24,6 +24,7 @@ + + // Qt + #include ++#include + + // Calligra + #include +diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp +index ed10919..8f52177 100644 +--- a/plugins/formulashape/FormulaToolWidget.cpp ++++ b/plugins/formulashape/FormulaToolWidget.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) +diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp +index a0a9832..7d7db53 100644 +--- a/sheets/dialogs/LayoutDialog.cpp ++++ b/sheets/dialogs/LayoutDialog.cpp +@@ -36,6 +36,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp +index d64208c..bfddb3a 100644 +--- a/words/part/dialogs/KWAnchoringProperties.cpp ++++ b/words/part/dialogs/KWAnchoringProperties.cpp +@@ -35,6 +35,7 @@ + + #include + ++#include + #include + + const int KWAnchoringProperties::vertRels[4][20] = { +diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp +index e38599a..7e8b2d5 100644 +--- a/words/part/dialogs/KWRunAroundProperties.cpp ++++ b/words/part/dialogs/KWRunAroundProperties.cpp +@@ -28,6 +28,8 @@ + + #include + ++#include ++ + KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) + : m_state(state) + { +-- +cgit v1.1 + +From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 +From: David Faure +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 +--- a/stage/part/KPrPresentationTool.cpp ++++ b/stage/part/KPrPresentationTool.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + #include +-- +cgit v1.1 + +From acd0ef39e3c945d066d2902de0e19fa2d020c7f8 Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 23 Jul 2019 12:20:03 +0200 +Subject: Fix compilation with Qt 5.13 (missing include) + +--- + plan/src/workpackage/view.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plan/src/workpackage/view.h b/plan/src/workpackage/view.h +index b10547e..c5231e59 100644 +--- a/plan/src/workpackage/view.h ++++ b/plan/src/workpackage/view.h +@@ -24,6 +24,7 @@ + #include + + #include ++#include + + class QPrinter; + class QPrintDialog; +-- +cgit v1.1 + +From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 23 Jul 2019 13:02:34 +0200 +Subject: Fix compilation with Qt 5.13 (missing include) + +--- + sheets/plugins/calendar/CalendarToolWidget.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp +index b10b230..0c5eeb6 100644 +--- a/sheets/plugins/calendar/CalendarToolWidget.cpp ++++ b/sheets/plugins/calendar/CalendarToolWidget.cpp +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + namespace Calligra + { +-- +cgit v1.1 + -- cgit v1.2.3-60-g2f50