From 53024a6140154243be46d3c4af4329e3c98275c2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 5 Jan 2016 17:35:58 +0100 Subject: [PATCH] + do not include from .qrc generated .cpp file from other .cpp file but add it to build system --- src/Mod/Drawing/Gui/AppDrawingGui.cpp | 1 - src/Mod/Fem/Gui/AppFemGui.cpp | 1 - src/Mod/MeshPart/Gui/AppMeshPartGui.cpp | 1 - src/Mod/PartDesign/Gui/AppPartDesignGui.cpp | 2 -- src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp | 2 -- src/Mod/Robot/Gui/AppRobotGui.cpp | 1 - src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp | 6 ------ src/Mod/Spreadsheet/Gui/CMakeLists.txt | 3 +-- 8 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Mod/Drawing/Gui/AppDrawingGui.cpp b/src/Mod/Drawing/Gui/AppDrawingGui.cpp index 01423052e..cf481d2c1 100644 --- a/src/Mod/Drawing/Gui/AppDrawingGui.cpp +++ b/src/Mod/Drawing/Gui/AppDrawingGui.cpp @@ -32,7 +32,6 @@ #include "Workbench.h" #include "ViewProviderPage.h" #include "ViewProviderView.h" -//#include "resources/qrc_Drawing.cpp" // use a different name to CreateCommand() void CreateDrawingCommands(void); diff --git a/src/Mod/Fem/Gui/AppFemGui.cpp b/src/Mod/Fem/Gui/AppFemGui.cpp index 3a4aa29c8..85a8603eb 100644 --- a/src/Mod/Fem/Gui/AppFemGui.cpp +++ b/src/Mod/Fem/Gui/AppFemGui.cpp @@ -52,7 +52,6 @@ #include "ViewProviderFemConstraintPulley.h" #include "ViewProviderResult.h" #include "Workbench.h" -//#include "resources/qrc_Fem.cpp" // use a different name to CreateCommand() void CreateFemCommands(void); diff --git a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp index 9661f091d..62cca702a 100644 --- a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp +++ b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp @@ -30,7 +30,6 @@ #include #include #include "Workbench.h" -//#include "resources/qrc_MeshPart.cpp" // use a different name to CreateCommand() void CreateMeshPartCommands(void); diff --git a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp index 963957d65..6fe67cbcc 100644 --- a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp +++ b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp @@ -45,8 +45,6 @@ #include "ViewProviderScaled.h" #include "ViewProviderMultiTransform.h" -//#include "resources/qrc_PartDesign.cpp" - // use a different name to CreateCommand() void CreatePartDesignCommands(void); diff --git a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp index 4401158b0..419222302 100644 --- a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp +++ b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp @@ -34,8 +34,6 @@ #include #include -//#include "resources/qrc_ReverseEngineering.cpp" - // use a different name to CreateCommand() void CreateReverseEngineeringCommands(void); diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp index f2d06c8c2..0b9c20c40 100644 --- a/src/Mod/Robot/Gui/AppRobotGui.cpp +++ b/src/Mod/Robot/Gui/AppRobotGui.cpp @@ -36,7 +36,6 @@ #include "ViewProviderTrajectoryDressUp.h" #include "ViewProviderTrajectoryCompound.h" #include "Workbench.h" -//#include "resources/qrc_Robot.cpp" // use a different name to CreateCommand() void CreateRobotCommands(void); diff --git a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp index 26526329b..a270b4efa 100644 --- a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp +++ b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp @@ -23,12 +23,6 @@ #include "ViewProviderSpreadsheet.h" #include "SpreadsheetView.h" -#if QT_VERSION >= 0x050000 -#include "qrc_Spreadsheet.cpp" -#else -#include "qrc_Spreadsheet.cxx" -#endif - // use a different name to CreateCommand() void CreateSpreadsheetCommands(void); diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt index 913045790..8f27a0392 100644 --- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt +++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt @@ -40,7 +40,6 @@ SET(SpreadsheetGui_RES_SRCS Resources/Spreadsheet.qrc ) -#fc_add_resources(SpreadsheetGui_QRC_SRCS ${SpreadsheetGui_RES_SRCS}) qt4_add_resources(SpreadsheetGui_QRC_SRCS ${SpreadsheetGui_RES_SRCS}) set(SpreadsheetGui_UIC_SRCS @@ -52,7 +51,7 @@ qt4_wrap_ui(SpreadsheetGui_UIC_HDRS ${SpreadsheetGui_UIC_SRCS}) SET(SpreadsheetGui_SRCS # ${SpreadsheetGui_MOC_SRCS} -# ${SpreadsheetGui_QRC_SRCS} + ${SpreadsheetGui_QRC_SRCS} AppSpreadsheetGui.cpp AppSpreadsheetGuiPy.cpp Command.cpp