From 155208c9c99bcade20c40bf31934af6179135762 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Aug 2018 22:44:51 +0200 Subject: [PATCH] MSVC compatible declaration of force link flags for Qt bindings. --- scripts/mkqtdecl_common/produce.rb | 4 ++-- src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h | 4 ++-- src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h | 4 ++-- src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h | 4 ++-- src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h | 4 ++-- src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h | 4 ++-- src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h | 4 ++-- src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h | 4 ++-- src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h | 4 ++-- src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h | 4 ++-- src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h | 4 ++-- src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h | 4 ++-- src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h | 4 ++-- src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h | 4 ++-- src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h | 4 ++-- src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h | 4 ++-- src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h | 4 ++-- src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb index 0dbfb6a09..12cc4028d 100755 --- a/scripts/mkqtdecl_common/produce.rb +++ b/scripts/mkqtdecl_common/produce.rb @@ -3080,8 +3080,6 @@ END src.puts("") src.puts("#include \"tlDefs.h\"") src.puts("") - src.puts("#define FORCE_LINK_GSI_#{modn.upcase} void force_link_gsi#{modn}_f () { extern int force_link_gsi#{modn}; force_link_gsi#{modn} = 0; }") - src.puts("") src.puts("#if !defined(HDR_gsi#{modn}Common_h)") src.puts("# define HDR_gsi#{modn}Common_h") src.puts("") @@ -3095,6 +3093,8 @@ END src.puts("# define GSI_#{modn.upcase}_LOCAL DEF_OUTSIDE_LOCAL") src.puts("# endif") src.puts("") + src.puts("#define FORCE_LINK_GSI_#{modn.upcase} void force_link_gsi#{modn}_f () { GSI_#{modn.upcase}_PUBLIC int force_link_gsi#{modn}; force_link_gsi#{modn} = 0; }") + src.puts("") src.puts("#endif") puts("#{src_name} written.") diff --git a/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h b/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h index dfc326514..ae3c7b7d6 100644 --- a/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h +++ b/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTCORE void force_link_gsiQtCore_f () { extern int force_link_gsiQtCore; force_link_gsiQtCore = 0; } - #if !defined(HDR_gsiQtCoreCommon_h) # define HDR_gsiQtCoreCommon_h @@ -22,4 +20,6 @@ # define GSI_QTCORE_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTCORE void force_link_gsiQtCore_f () { GSI_QTCORE_PUBLIC int force_link_gsiQtCore; force_link_gsiQtCore = 0; } + #endif diff --git a/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h b/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h index 7a47ef222..a944bb01a 100644 --- a/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h +++ b/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTDESIGNER void force_link_gsiQtDesigner_f () { extern int force_link_gsiQtDesigner; force_link_gsiQtDesigner = 0; } - #if !defined(HDR_gsiQtDesignerCommon_h) # define HDR_gsiQtDesignerCommon_h @@ -22,4 +20,6 @@ # define GSI_QTDESIGNER_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTDESIGNER void force_link_gsiQtDesigner_f () { GSI_QTDESIGNER_PUBLIC int force_link_gsiQtDesigner; force_link_gsiQtDesigner = 0; } + #endif diff --git a/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h b/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h index 71f38c420..8592f485c 100644 --- a/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h +++ b/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTGUI void force_link_gsiQtGui_f () { extern int force_link_gsiQtGui; force_link_gsiQtGui = 0; } - #if !defined(HDR_gsiQtGuiCommon_h) # define HDR_gsiQtGuiCommon_h @@ -22,4 +20,6 @@ # define GSI_QTGUI_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTGUI void force_link_gsiQtGui_f () { GSI_QTGUI_PUBLIC int force_link_gsiQtGui; force_link_gsiQtGui = 0; } + #endif diff --git a/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h b/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h index 84974270d..e618cad98 100644 --- a/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h +++ b/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTNETWORK void force_link_gsiQtNetwork_f () { extern int force_link_gsiQtNetwork; force_link_gsiQtNetwork = 0; } - #if !defined(HDR_gsiQtNetworkCommon_h) # define HDR_gsiQtNetworkCommon_h @@ -22,4 +20,6 @@ # define GSI_QTNETWORK_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTNETWORK void force_link_gsiQtNetwork_f () { GSI_QTNETWORK_PUBLIC int force_link_gsiQtNetwork; force_link_gsiQtNetwork = 0; } + #endif diff --git a/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h b/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h index a5fb061ee..684ce81ec 100644 --- a/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h +++ b/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTSQL void force_link_gsiQtSql_f () { extern int force_link_gsiQtSql; force_link_gsiQtSql = 0; } - #if !defined(HDR_gsiQtSqlCommon_h) # define HDR_gsiQtSqlCommon_h @@ -22,4 +20,6 @@ # define GSI_QTSQL_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTSQL void force_link_gsiQtSql_f () { GSI_QTSQL_PUBLIC int force_link_gsiQtSql; force_link_gsiQtSql = 0; } + #endif diff --git a/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h b/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h index 340421880..3e1de86f4 100644 --- a/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h +++ b/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTXML void force_link_gsiQtXml_f () { extern int force_link_gsiQtXml; force_link_gsiQtXml = 0; } - #if !defined(HDR_gsiQtXmlCommon_h) # define HDR_gsiQtXmlCommon_h @@ -22,4 +20,6 @@ # define GSI_QTXML_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTXML void force_link_gsiQtXml_f () { GSI_QTXML_PUBLIC int force_link_gsiQtXml; force_link_gsiQtXml = 0; } + #endif diff --git a/src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h b/src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h index dfc326514..ae3c7b7d6 100644 --- a/src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h +++ b/src/gsiqt/qt5/QtCore/gsiQtCoreCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTCORE void force_link_gsiQtCore_f () { extern int force_link_gsiQtCore; force_link_gsiQtCore = 0; } - #if !defined(HDR_gsiQtCoreCommon_h) # define HDR_gsiQtCoreCommon_h @@ -22,4 +20,6 @@ # define GSI_QTCORE_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTCORE void force_link_gsiQtCore_f () { GSI_QTCORE_PUBLIC int force_link_gsiQtCore; force_link_gsiQtCore = 0; } + #endif diff --git a/src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h b/src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h index 7a47ef222..a944bb01a 100644 --- a/src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h +++ b/src/gsiqt/qt5/QtDesigner/gsiQtDesignerCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTDESIGNER void force_link_gsiQtDesigner_f () { extern int force_link_gsiQtDesigner; force_link_gsiQtDesigner = 0; } - #if !defined(HDR_gsiQtDesignerCommon_h) # define HDR_gsiQtDesignerCommon_h @@ -22,4 +20,6 @@ # define GSI_QTDESIGNER_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTDESIGNER void force_link_gsiQtDesigner_f () { GSI_QTDESIGNER_PUBLIC int force_link_gsiQtDesigner; force_link_gsiQtDesigner = 0; } + #endif diff --git a/src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h b/src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h index 71f38c420..8592f485c 100644 --- a/src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h +++ b/src/gsiqt/qt5/QtGui/gsiQtGuiCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTGUI void force_link_gsiQtGui_f () { extern int force_link_gsiQtGui; force_link_gsiQtGui = 0; } - #if !defined(HDR_gsiQtGuiCommon_h) # define HDR_gsiQtGuiCommon_h @@ -22,4 +20,6 @@ # define GSI_QTGUI_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTGUI void force_link_gsiQtGui_f () { GSI_QTGUI_PUBLIC int force_link_gsiQtGui; force_link_gsiQtGui = 0; } + #endif diff --git a/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h b/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h index ab53a949d..dd88fd74c 100644 --- a/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h +++ b/src/gsiqt/qt5/QtMultimedia/gsiQtMultimediaCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTMULTIMEDIA void force_link_gsiQtMultimedia_f () { extern int force_link_gsiQtMultimedia; force_link_gsiQtMultimedia = 0; } - #if !defined(HDR_gsiQtMultimediaCommon_h) # define HDR_gsiQtMultimediaCommon_h @@ -22,4 +20,6 @@ # define GSI_QTMULTIMEDIA_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTMULTIMEDIA void force_link_gsiQtMultimedia_f () { GSI_QTMULTIMEDIA_PUBLIC int force_link_gsiQtMultimedia; force_link_gsiQtMultimedia = 0; } + #endif diff --git a/src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h b/src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h index 84974270d..e618cad98 100644 --- a/src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h +++ b/src/gsiqt/qt5/QtNetwork/gsiQtNetworkCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTNETWORK void force_link_gsiQtNetwork_f () { extern int force_link_gsiQtNetwork; force_link_gsiQtNetwork = 0; } - #if !defined(HDR_gsiQtNetworkCommon_h) # define HDR_gsiQtNetworkCommon_h @@ -22,4 +20,6 @@ # define GSI_QTNETWORK_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTNETWORK void force_link_gsiQtNetwork_f () { GSI_QTNETWORK_PUBLIC int force_link_gsiQtNetwork; force_link_gsiQtNetwork = 0; } + #endif diff --git a/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h b/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h index 7d488097a..0c5e9e588 100644 --- a/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h +++ b/src/gsiqt/qt5/QtPrintSupport/gsiQtPrintSupportCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTPRINTSUPPORT void force_link_gsiQtPrintSupport_f () { extern int force_link_gsiQtPrintSupport; force_link_gsiQtPrintSupport = 0; } - #if !defined(HDR_gsiQtPrintSupportCommon_h) # define HDR_gsiQtPrintSupportCommon_h @@ -22,4 +20,6 @@ # define GSI_QTPRINTSUPPORT_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTPRINTSUPPORT void force_link_gsiQtPrintSupport_f () { GSI_QTPRINTSUPPORT_PUBLIC int force_link_gsiQtPrintSupport; force_link_gsiQtPrintSupport = 0; } + #endif diff --git a/src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h b/src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h index a5fb061ee..684ce81ec 100644 --- a/src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h +++ b/src/gsiqt/qt5/QtSql/gsiQtSqlCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTSQL void force_link_gsiQtSql_f () { extern int force_link_gsiQtSql; force_link_gsiQtSql = 0; } - #if !defined(HDR_gsiQtSqlCommon_h) # define HDR_gsiQtSqlCommon_h @@ -22,4 +20,6 @@ # define GSI_QTSQL_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTSQL void force_link_gsiQtSql_f () { GSI_QTSQL_PUBLIC int force_link_gsiQtSql; force_link_gsiQtSql = 0; } + #endif diff --git a/src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h b/src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h index ac5ed2a77..1b65bdca4 100644 --- a/src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h +++ b/src/gsiqt/qt5/QtSvg/gsiQtSvgCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTSVG void force_link_gsiQtSvg_f () { extern int force_link_gsiQtSvg; force_link_gsiQtSvg = 0; } - #if !defined(HDR_gsiQtSvgCommon_h) # define HDR_gsiQtSvgCommon_h @@ -22,4 +20,6 @@ # define GSI_QTSVG_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTSVG void force_link_gsiQtSvg_f () { GSI_QTSVG_PUBLIC int force_link_gsiQtSvg; force_link_gsiQtSvg = 0; } + #endif diff --git a/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h b/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h index 40a8028a1..1d3e73c40 100644 --- a/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h +++ b/src/gsiqt/qt5/QtWidgets/gsiQtWidgetsCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTWIDGETS void force_link_gsiQtWidgets_f () { extern int force_link_gsiQtWidgets; force_link_gsiQtWidgets = 0; } - #if !defined(HDR_gsiQtWidgetsCommon_h) # define HDR_gsiQtWidgetsCommon_h @@ -22,4 +20,6 @@ # define GSI_QTWIDGETS_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTWIDGETS void force_link_gsiQtWidgets_f () { GSI_QTWIDGETS_PUBLIC int force_link_gsiQtWidgets; force_link_gsiQtWidgets = 0; } + #endif diff --git a/src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h b/src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h index 340421880..3e1de86f4 100644 --- a/src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h +++ b/src/gsiqt/qt5/QtXml/gsiQtXmlCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTXML void force_link_gsiQtXml_f () { extern int force_link_gsiQtXml; force_link_gsiQtXml = 0; } - #if !defined(HDR_gsiQtXmlCommon_h) # define HDR_gsiQtXmlCommon_h @@ -22,4 +20,6 @@ # define GSI_QTXML_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTXML void force_link_gsiQtXml_f () { GSI_QTXML_PUBLIC int force_link_gsiQtXml; force_link_gsiQtXml = 0; } + #endif diff --git a/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h b/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h index 7e8f3a5a6..f8101698e 100644 --- a/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h +++ b/src/gsiqt/qt5/QtXmlPatterns/gsiQtXmlPatternsCommon.h @@ -7,8 +7,6 @@ #include "tlDefs.h" -#define FORCE_LINK_GSI_QTXMLPATTERNS void force_link_gsiQtXmlPatterns_f () { extern int force_link_gsiQtXmlPatterns; force_link_gsiQtXmlPatterns = 0; } - #if !defined(HDR_gsiQtXmlPatternsCommon_h) # define HDR_gsiQtXmlPatternsCommon_h @@ -22,4 +20,6 @@ # define GSI_QTXMLPATTERNS_LOCAL DEF_OUTSIDE_LOCAL # endif +#define FORCE_LINK_GSI_QTXMLPATTERNS void force_link_gsiQtXmlPatterns_f () { GSI_QTXMLPATTERNS_PUBLIC int force_link_gsiQtXmlPatterns; force_link_gsiQtXmlPatterns = 0; } + #endif