Merge d3e8fb4 into fac9d8b

opencor · Dec 22, 2018 · b68e55b · b68e55b
2 parents fac9d8b + d3e8fb4
commit b68e55b
Show file tree

Hide file tree

Showing 25 changed files with 71 additions and 155 deletions.
diff --git a/src/plugins/dataStore/DataStore/src/datastoreglobal.h b/src/plugins/dataStore/DataStore/src/datastoreglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef DataStore_PLUGIN
-        #define DATASTORE_EXPORT __declspec(dllexport)
-    #else
-        #define DATASTORE_EXPORT __declspec(dllimport)
-    #endif
+#ifdef DataStore_PLUGIN
+    #define DATASTORE_EXPORT Q_DECL_EXPORT
 #else
-    #define DATASTORE_EXPORT
+    #define DATASTORE_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/editing/CellMLEditingView/src/cellmleditingviewglobal.h b/src/plugins/editing/CellMLEditingView/src/cellmleditingviewglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef CellMLEditingView_PLUGIN
-        #define CELLMLEDITINGVIEW_EXPORT __declspec(dllexport)
-    #else
-        #define CELLMLEDITINGVIEW_EXPORT __declspec(dllimport)
-    #endif
+#ifdef CellMLEditingView_PLUGIN
+    #define CELLMLEDITINGVIEW_EXPORT Q_DECL_EXPORT
 #else
-    #define CELLMLEDITINGVIEW_EXPORT
+    #define CELLMLEDITINGVIEW_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/editing/CellMLTextView/CMakeLists.txt b/src/plugins/editing/CellMLTextView/CMakeLists.txt
@@ -27,8 +27,6 @@ add_plugin(CellMLTextView
         src/cellmltextviewplugin.h
         src/cellmltextviewscanner.h
         src/cellmltextviewwidget.h
-    DEFINITIONS
-        QSCINTILLA_DLL
     PLUGINS
         CellMLEditingView
     TESTS

diff --git a/src/plugins/editing/SEDMLEditingView/src/sedmleditingviewglobal.h b/src/plugins/editing/SEDMLEditingView/src/sedmleditingviewglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef SEDMLEditingView_PLUGIN
-        #define SEDMLEDITINGVIEW_EXPORT __declspec(dllexport)
-    #else
-        #define SEDMLEDITINGVIEW_EXPORT __declspec(dllimport)
-    #endif
+#ifdef SEDMLEditingView_PLUGIN
+    #define SEDMLEDITINGVIEW_EXPORT Q_DECL_EXPORT
 #else
-    #define SEDMLEDITINGVIEW_EXPORT
+    #define SEDMLEDITINGVIEW_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/miscellaneous/Compiler/src/compilerglobal.h b/src/plugins/miscellaneous/Compiler/src/compilerglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef Compiler_PLUGIN
-        #define COMPILER_EXPORT __declspec(dllexport)
-    #else
-        #define COMPILER_EXPORT __declspec(dllimport)
-    #endif
+#ifdef Compiler_PLUGIN
+    #define COMPILER_EXPORT Q_DECL_EXPORT
 #else
-    #define COMPILER_EXPORT
+    #define COMPILER_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/miscellaneous/Compiler/tests/tests.cpp b/src/plugins/miscellaneous/Compiler/tests/tests.cpp
@@ -21,12 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Compiler tests
 //==============================================================================
 
-#ifdef _WIN32
-    #define _SCL_SECURE_NO_WARNINGS
-#endif
-
-//==============================================================================
-
 #include "compilerengine.h"
 #include "compilermath.h"
 #include "tests.h"

diff --git a/src/plugins/miscellaneous/Core/src/coreglobal.h b/src/plugins/miscellaneous/Core/src/coreglobal.h
@@ -28,14 +28,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef OpenCOR_MAIN
     #define CORE_EXPORT
 #else
-    #ifdef _WIN32
-        #ifdef Core_PLUGIN
-            #define CORE_EXPORT __declspec(dllexport)
-        #else
-            #define CORE_EXPORT __declspec(dllimport)
-        #endif
+    #ifdef Core_PLUGIN
+        #define CORE_EXPORT Q_DECL_EXPORT
     #else
-        #define CORE_EXPORT
+        #define CORE_EXPORT Q_DECL_IMPORT
     #endif
 #endif
 

diff --git a/src/plugins/sample/Sample/src/sampleglobal.h b/src/plugins/sample/Sample/src/sampleglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef Sample_PLUGIN
-        #define SAMPLE_EXPORT __declspec(dllexport)
-    #else
-        #define SAMPLE_EXPORT __declspec(dllimport)
-    #endif
+#ifdef Sample_PLUGIN
+    #define SAMPLE_EXPORT Q_DECL_EXPORT
 #else
-    #define SAMPLE_EXPORT
+    #define SAMPLE_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/sample/Sample/src/sampleutilities.h b/src/plugins/sample/Sample/src/sampleutilities.h
@@ -25,6 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
+#include <qglobal.h>
+
+//==============================================================================
+
 #include "sampleglobal.h"
 
 //==============================================================================

diff --git a/src/plugins/support/COMBINESupport/src/combinesupportglobal.h b/src/plugins/support/COMBINESupport/src/combinesupportglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef COMBINESupport_PLUGIN
-        #define COMBINESUPPORT_EXPORT __declspec(dllexport)
-    #else
-        #define COMBINESUPPORT_EXPORT __declspec(dllimport)
-    #endif
+#ifdef COMBINESupport_PLUGIN
+    #define COMBINESUPPORT_EXPORT Q_DECL_EXPORT
 #else
-    #define COMBINESUPPORT_EXPORT
+    #define COMBINESUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/support/CellMLSupport/src/cellmlfileruntime.cpp b/src/plugins/support/CellMLSupport/src/cellmlfileruntime.cpp
@@ -22,8 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #ifdef _WIN32
-    #define _SCL_SECURE_NO_WARNINGS
-
     #define NOMINMAX
 #endif
 

diff --git a/src/plugins/support/CellMLSupport/src/cellmlsupportglobal.h b/src/plugins/support/CellMLSupport/src/cellmlsupportglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef CellMLSupport_PLUGIN
-        #define CELLMLSUPPORT_EXPORT __declspec(dllexport)
-    #else
-        #define CELLMLSUPPORT_EXPORT __declspec(dllimport)
-    #endif
+#ifdef CellMLSupport_PLUGIN
+    #define CELLMLSUPPORT_EXPORT Q_DECL_EXPORT
 #else
-    #define CELLMLSUPPORT_EXPORT
+    #define CELLMLSUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/support/PMRSupport/src/pmrsupportglobal.h b/src/plugins/support/PMRSupport/src/pmrsupportglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef PMRSupport_PLUGIN
-        #define PMRSUPPORT_EXPORT __declspec(dllexport)
-    #else
-        #define PMRSUPPORT_EXPORT __declspec(dllimport)
-    #endif
+#ifdef PMRSupport_PLUGIN
+    #define PMRSUPPORT_EXPORT Q_DECL_EXPORT
 #else
-    #define PMRSUPPORT_EXPORT
+    #define PMRSUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/support/QScintillaSupport/CMakeLists.txt b/src/plugins/support/QScintillaSupport/CMakeLists.txt
@@ -11,8 +11,6 @@ add_plugin(QScintillaSupport
     HEADERS_MOC
         src/qscintillasupportplugin.h
         src/qscintillawidget.h
-    DEFINITIONS
-        QSCINTILLA_DLL
     PLUGINS
         Core
         QScintilla

diff --git a/src/plugins/support/QScintillaSupport/src/qscintillasupportglobal.h b/src/plugins/support/QScintillaSupport/src/qscintillasupportglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef QScintillaSupport_PLUGIN
-        #define QSCINTILLASUPPORT_EXPORT __declspec(dllexport)
-    #else
-        #define QSCINTILLASUPPORT_EXPORT __declspec(dllimport)
-    #endif
+#ifdef QScintillaSupport_PLUGIN
+    #define QSCINTILLASUPPORT_EXPORT Q_DECL_EXPORT
 #else
-    #define QSCINTILLASUPPORT_EXPORT
+    #define QSCINTILLASUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/support/SEDMLSupport/src/sedmlsupportglobal.h b/src/plugins/support/SEDMLSupport/src/sedmlsupportglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef SEDMLSupport_PLUGIN
-        #define SEDMLSUPPORT_EXPORT __declspec(dllexport)
-    #else
-        #define SEDMLSUPPORT_EXPORT __declspec(dllimport)
-    #endif
+#ifdef SEDMLSupport_PLUGIN
+    #define SEDMLSUPPORT_EXPORT Q_DECL_EXPORT
 #else
-    #define SEDMLSUPPORT_EXPORT
+    #define SEDMLSUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/support/SimulationSupport/src/simulationsupportglobal.h b/src/plugins/support/SimulationSupport/src/simulationsupportglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef SimulationSupport_PLUGIN
-        #define SIMULATIONSUPPORT_EXPORT __declspec(dllexport)
-    #else
-        #define SIMULATIONSUPPORT_EXPORT __declspec(dllimport)
-    #endif
+#ifdef SimulationSupport_PLUGIN
+    #define SIMULATIONSUPPORT_EXPORT Q_DECL_EXPORT
 #else
-    #define SIMULATIONSUPPORT_EXPORT
+    #define SIMULATIONSUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/support/StandardSupport/src/standardsupportglobal.h b/src/plugins/support/StandardSupport/src/standardsupportglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef StandardSupport_PLUGIN
-        #define STANDARDSUPPORT_EXPORT __declspec(dllexport)
-    #else
-        #define STANDARDSUPPORT_EXPORT __declspec(dllimport)
-    #endif
+#ifdef StandardSupport_PLUGIN
+    #define STANDARDSUPPORT_EXPORT Q_DECL_EXPORT
 #else
-    #define STANDARDSUPPORT_EXPORT
+    #define STANDARDSUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/support/ZIPSupport/src/zipsupportglobal.h b/src/plugins/support/ZIPSupport/src/zipsupportglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef ZIPSupport_PLUGIN
-        #define ZIPSUPPORT_EXPORT __declspec(dllexport)
-    #else
-        #define ZIPSUPPORT_EXPORT __declspec(dllimport)
-    #endif
+#ifdef ZIPSupport_PLUGIN
+    #define ZIPSUPPORT_EXPORT Q_DECL_EXPORT
 #else
-    #define ZIPSUPPORT_EXPORT
+    #define ZIPSUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/thirdParty/QScintilla/CMakeLists.txt b/src/plugins/thirdParty/QScintilla/CMakeLists.txt
@@ -65,27 +65,27 @@ if(USE_PREBUILT_QSCINTILLA_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 7a383d7683294a31f6ead1fb78e0693619de3cdc
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 7144c15777909a40722eab7aeabf3a7661d19cff
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 91b3e2ade78d278c0fa221efa7f9f731a5798d37
-                                              fea522955340103f3be286fb15731d7a31a56be3)
+                                  SHA1_VALUES 74b7ddd45c38cd0c7622173d60d174661cc56125
+                                              a23c16ae6b07646a4d8ce35f0469b0fed1f26b97)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 3aa0c93a32ccfdeb586b0b8b89a40ad35729027d
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 9370f7fd1f9e935b384b2429408ea7c8095679e9
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 18a2bcc82f9c43e627779a32d47afe3d728dd907
-                                              ed4d60b90647047d8435d62c0246d8379323ba81)
+                                  SHA1_VALUES 4dacc93296ed7c036798fe429bd6efc7ed1c9710
+                                              ac395452475cd6e1b8e08ea539567a7aeaaafb7b)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} acf46e5afd23683590e59685efc1d2086aa74f95
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 410a2f3e5cd63d11da5971f4dd3d7a431a63607c
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES d259832c6388c9c446e9fe25ae5dfb71bf25c4e4)
+                              SHA1_VALUES cc7875d326ea3f47b080d7b58e0b118b4d18165a)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} dcb6a5f68f0d3a030af77cc013e9230d5c1d7836
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 12f962640a90932d61bf6b112b459afb86bf5c7b
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 80f6eb17c68595d5ab5b3b99c38fa3be4bf441f8)
+                              SHA1_VALUES 15d49928fa7786291015169fb34f97e16357d4a8)
     endif()
 else()
     # Set platform specific configuration options

diff --git a/src/plugins/widget/EditorWidget/src/editorwidgetglobal.h b/src/plugins/widget/EditorWidget/src/editorwidgetglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef EditorWidget_PLUGIN
-        #define EDITORWIDGET_EXPORT __declspec(dllexport)
-    #else
-        #define EDITORWIDGET_EXPORT __declspec(dllimport)
-    #endif
+#ifdef EditorWidget_PLUGIN
+    #define EDITORWIDGET_EXPORT Q_DECL_EXPORT
 #else
-    #define EDITORWIDGET_EXPORT
+    #define EDITORWIDGET_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/widget/GraphPanelWidget/src/graphpanelwidgetglobal.h b/src/plugins/widget/GraphPanelWidget/src/graphpanelwidgetglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef GraphPanelWidget_PLUGIN
-        #define GRAPHPANELWIDGET_EXPORT __declspec(dllexport)
-    #else
-        #define GRAPHPANELWIDGET_EXPORT __declspec(dllimport)
-    #endif
+#ifdef GraphPanelWidget_PLUGIN
+    #define GRAPHPANELWIDGET_EXPORT Q_DECL_EXPORT
 #else
-    #define GRAPHPANELWIDGET_EXPORT
+    #define GRAPHPANELWIDGET_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================

diff --git a/src/plugins/widget/MathMLViewerWidget/src/mathmlviewerwidgetglobal.h b/src/plugins/widget/MathMLViewerWidget/src/mathmlviewerwidgetglobal.h
@@ -25,14 +25,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#ifdef _WIN32
-    #ifdef MathMLViewerWidget_PLUGIN
-        #define MATHMLVIEWERWIDGET_EXPORT __declspec(dllexport)
-    #else
-        #define MATHMLVIEWERWIDGET_EXPORT __declspec(dllimport)
-    #endif
+#ifdef MathMLViewerWidget_PLUGIN
+    #define MATHMLVIEWERWIDGET_EXPORT Q_DECL_EXPORT
 #else
-    #define MATHMLVIEWERWIDGET_EXPORT
+    #define MATHMLVIEWERWIDGET_EXPORT Q_DECL_IMPORT
 #endif
 
 //==============================================================================