Changeset 99

Timestamp:

Jul 21, 2006, 9:24:43 PM (19 years ago)

Author:

dmik

Message:

Plugin Support: Fixed: Q_EXPORT_PLUGIN and Q_EXPORT_COMPONENT macros procudced entry points with underscores, but resolved them without. Now, entry points use the _System decl to prevent underscores at all.

Location:

trunk

Files:

• include/qgplugin.h (modified) (2 diffs)
• src/tools/qcom_p.h (modified) (2 diffs)
• src/tools/qcomlibrary.cpp (modified) (2 diffs)

trunk/include/qgplugin.h

@@ -91 +91 @@
         }
 
-#    ifdef Q_WS_WIN
+#    if defined(Q_WS_WIN)
 #       ifdef Q_CC_BOR
 #           define Q_EXPORT_PLUGIN(PLUGIN) \
@@ -110 +110 @@
                 Q_PLUGIN_INSTANTIATE( PLUGIN )
 #       endif
+#    elif defined(Q_OS_OS2)
+#       define Q_EXPORT_PLUGIN(PLUGIN) \
+            Q_PLUGIN_VERIFICATION_DATA \
+            Q_EXTERN_C \
+            const char * _System qt_ucm_query_verification_data() \
+            { return qt_ucm_verification_data; } \
+            Q_EXTERN_C QUnknownInterface * _System ucm_instantiate() \
+            Q_PLUGIN_INSTANTIATE( PLUGIN )
 #    else
 #       define Q_EXPORT_PLUGIN(PLUGIN) \

trunk/src/tools/qcom_p.h

@@ -305 +305 @@
 #endif // Q_CREATE_INSTANCE
 
-#    ifdef Q_WS_WIN
+#    if defined(Q_WS_WIN)
 #       ifdef Q_CC_BOR
 #           define Q_EXPORT_COMPONENT() \
@@ -322 +322 @@
                 Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate()
 #       endif
+#    elif defined(Q_OS_OS2)
+#       define Q_EXPORT_COMPONENT() \
+            Q_UCM_VERIFICATION_DATA \
+            Q_EXTERN_C \
+            const char * _System qt_ucm_query_verification_data() \
+            { return qt_ucm_verification_data; } \
+            Q_EXTERN_C QUnknownInterface * _System ucm_instantiate()
 #    else
 #       define Q_EXPORT_COMPONENT() \

trunk/src/tools/qcomlibrary.cpp

@@ -437 +437 @@
         }
 
-#  ifdef Q_CC_BOR
+#  if defined(Q_CC_BOR)
         typedef const char * __stdcall (*UCMQueryVerificationDataProc)();
+#  elif defined(Q_OS_OS2)
+        typedef const char * _System (*UCMQueryVerificationDataProc)();
 #  else
         typedef const char * (*UCMQueryVerificationDataProc)();
@@ -490 +492 @@
 #ifdef Q_CC_BOR
     typedef QUnknownInterface* __stdcall (*UCMInstanceProc)();
+#elif defined(Q_OS_OS2)
+    typedef QUnknownInterface* _System (*UCMInstanceProc)();
 #else
     typedef QUnknownInterface* (*UCMInstanceProc)();