Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-02-03 07:47:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
94bf60c45e
desktop/freecad/qt5.11.patch
AlmAck 15f49396be freecad 0.17
2018-06-24 22:20:27 +02:00

311 lines
11 KiB
Diff
Raw Blame History

From 018b41032a5af616fb861538695f8be14ad120ce Mon Sep 17 00:00:00 2001
From: sL1pKn07 <sl1pkn07@gmail.com>
Date: Sat, 7 Apr 2018 02:17:49 +0200
Subject: [PATCH] [For v018] Fix build with Qt5 beta
Seems need add some headers for build with incoming Qt 5.11 (Tested with 5.11.0beta2)
---
src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintContact.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintForce.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp | 1 +
src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp | 1 +
src/Mod/MeshPart/Gui/Tessellation.cpp | 1 +
src/Mod/Part/Gui/DlgSettingsGeneral.cpp | 3 +++
src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskChamferParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskDraftParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskFilletParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskScaledParameters.cpp | 1 +
src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp | 1 +
23 files changed, 25 insertions(+)
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
index c3992f9d8aa..cd9b64a9463 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
@@ -28,6 +28,7 @@
# include <QRegExp>
# include <QTextStream>
# include <QMessageBox>
+# include <QAction>
# include <Precision.hxx>
# include <TopoDS.hxx>
# include <BRepAdaptor_Surface.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
index c445ca1c8b7..6fe9898e136 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
@@ -32,6 +32,7 @@
# include <Geom_Plane.hxx>
# include <Precision.hxx>
# include <QMessageBox>
+# include <QAction>
# include <QRegExp>
# include <QTextStream>
# include <TopoDS.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
index 0a83e737b50..cfb16d9d81b 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
@@ -32,6 +32,7 @@
# include <Geom_Plane.hxx>
# include <Precision.hxx>
# include <QMessageBox>
+# include <QAction>
# include <QRegExp>
# include <QTextStream>
# include <TopoDS.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
index 0d864e47ec9..183719432e0 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
@@ -29,6 +29,7 @@
# include <Geom_Plane.hxx>
# include <Precision.hxx>
# include <QMessageBox>
+# include <QAction>
# include <QRegExp>
# include <QTextStream>
# include <TopoDS.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
index c9964403b4a..8aaacdcf4e1 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
@@ -29,6 +29,7 @@
# include <QRegExp>
# include <QTextStream>
# include <QMessageBox>
+# include <QAction>
# include <Precision.hxx>
# include <TopoDS.hxx>
# include <TopoDS_Shape.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
index 33deb1b005b..94fa4209aa2 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
@@ -28,6 +28,7 @@
# include <QRegExp>
# include <QTextStream>
# include <QMessageBox>
+# include <QAction>
# include <Precision.hxx>
# include <TopoDS.hxx>
# include <BRepAdaptor_Surface.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
index 344b8d32ba1..20a636215de 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
@@ -32,6 +32,7 @@
# include <Geom_Plane.hxx>
# include <Precision.hxx>
# include <QMessageBox>
+# include <QAction>
# include <QRegExp>
# include <QTextStream>
# include <TopoDS.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
index b4c3cb03bb3..29d90c3341b 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
@@ -30,6 +30,7 @@
# include <QRegExp>
# include <QTextStream>
# include <QMessageBox>
+# include <QAction>
# include <Precision.hxx>
# include <TopoDS.hxx>
# include <BRepAdaptor_Surface.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
index 2da2b11cb6b..a85289183f6 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
@@ -30,6 +30,7 @@
# include <Geom_Plane.hxx>
# include <Precision.hxx>
# include <QMessageBox>
+# include <QAction>
# include <QRegExp>
# include <QTextStream>
# include <TopoDS.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
index 42c0d8f2eb2..88e9029fd5f 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
@@ -32,6 +32,7 @@
# include <Geom_Plane.hxx>
# include <Precision.hxx>
# include <QMessageBox>
+# include <QAction>
# include <QRegExp>
# include <QTextStream>
# include <TopoDS.hxx>
diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
index 35a1fcf5bf6..e3afeb785c9 100644
--- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
+++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
@@ -33,6 +33,7 @@
# include <Geom_Plane.hxx>
# include <Precision.hxx>
# include <QMessageBox>
+# include <QAction>
# include <QRegExp>
# include <QTextStream>
# include <TopoDS.hxx>
diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp
index e392d470b7e..7636ad2fbbc 100644
--- a/src/Mod/MeshPart/Gui/Tessellation.cpp
+++ b/src/Mod/MeshPart/Gui/Tessellation.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <TopExp_Explorer.hxx>
# include <QMessageBox>
+# include <QButtonGroup>
#endif
#include "Tessellation.h"
diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
index d0cf0f94eee..b44eac6ff70 100644
--- a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
+++ b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
@@ -22,6 +22,9 @@
#include "PreCompiled.h"
+#ifndef _PreComp_
+# include <QButtonGroup>
+#endif
#include <Interface_Static.hxx>
diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
index 78570544845..7e3280065ca 100644
--- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
+# include <QAction>
#endif
#include "ui_TaskBooleanParameters.h"
diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
index 330d5853512..4600cc25b62 100644
--- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
@@ -24,6 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
+# include <QAction>
#endif
#include "ui_TaskChamferParameters.h"
diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
index 556fc92ae1f..020148001cd 100644
--- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
+# include <QAction>
#endif
#include "ui_TaskDraftParameters.h"
diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
index 3c4025574ad..5e0c31ec64a 100644
--- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
@@ -24,6 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
+# include <QAction>
#endif
#include "ui_TaskFilletParameters.h"
diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
index 532936310be..1970db7ef08 100644
--- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
+# include <QAction>
# include <QTimer>
#endif
diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
index 084ab353c35..f8e96fd6c52 100644
--- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
+# include <QAction>
#endif
#include <Base/Console.h>
diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
index 1fe452a593e..d5a5317ae80 100644
--- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
+# include <QAction>
#endif
#include "ui_TaskMultiTransformParameters.h"
diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
index 874273f63e6..79c564d0965 100644
--- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
+# include <QAction>
# include <QTimer>
#endif
diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
index 593664c9bdb..acaacce6ee8 100644
--- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
@@ -25,6 +25,7 @@
#ifndef _PreComp_
# include <QMessageBox>
+# include <QAction>
#endif
#include "ui_TaskScaledParameters.h"
diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
index b3f17f299d4..5b907304fcc 100644
--- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
@@ -24,6 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
+# include <QAction>
#endif
#include "ui_TaskThicknessParameters.h"
Reference in New Issue View Git Blame Copy Permalink