diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-08 21:59:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-08 21:59:07 -0600 |
| commit | 2ae2f3f719ab9316eb2addef265c78ab81327516 (patch) | |
| tree | 58511ab39204ff6a35f45f892cf3510c9aba0174 /src/kernel/qgplugin.h | |
| parent | e9c23befee596e80f840ff9a1a1a3b849972f211 (diff) | |
| download | tqt3-2ae2f3f719ab9316eb2addef265c78ab81327516.tar.gz tqt3-2ae2f3f719ab9316eb2addef265c78ab81327516.zip | |
Update tqt3 to support gcc visibility
This closes Bug 696
Diffstat (limited to 'src/kernel/qgplugin.h')
| -rw-r--r-- | src/kernel/qgplugin.h | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/src/kernel/qgplugin.h b/src/kernel/qgplugin.h index 36ecd3ea0..354122bca 100644 --- a/src/kernel/qgplugin.h +++ b/src/kernel/qgplugin.h @@ -93,35 +93,19 @@ return i->iface(); \ } -# ifdef Q_WS_WIN -# ifdef Q_CC_BOR -# define Q_EXPORT_PLUGIN(PLUGIN) \ - Q_PLUGIN_VERIFICATION_DATA \ - Q_EXTERN_C __declspec(dllexport) \ - const char * __stdcall qt_ucm_query_verification_data() \ - { return qt_ucm_verification_data; } \ - Q_EXTERN_C __declspec(dllexport) TQUnknownInterface* \ - __stdcall ucm_instantiate() \ - Q_PLUGIN_INSTANTIATE( PLUGIN ) -# else -# define Q_EXPORT_PLUGIN(PLUGIN) \ - Q_PLUGIN_VERIFICATION_DATA \ - Q_EXTERN_C __declspec(dllexport) \ - const char *qt_ucm_query_verification_data() \ - { return qt_ucm_verification_data; } \ - Q_EXTERN_C __declspec(dllexport) TQUnknownInterface* ucm_instantiate() \ - Q_PLUGIN_INSTANTIATE( PLUGIN ) -# endif -# else -# define Q_EXPORT_PLUGIN(PLUGIN) \ +#if defined(Q_WS_WIN) && defined(Q_CC_BOR) +# define Q_STDCALL __stdcall +#else +# define Q_STDCALL +#endif + +#define Q_EXPORT_PLUGIN(PLUGIN) \ Q_PLUGIN_VERIFICATION_DATA \ - Q_EXTERN_C \ - const char *qt_ucm_query_verification_data() \ + Q_EXTERN_C Q_EXPORT \ + const char * Q_STDCALL qt_ucm_query_verification_data() \ { return qt_ucm_verification_data; } \ - Q_EXTERN_C TQUnknownInterface* ucm_instantiate() \ + Q_EXTERN_C Q_EXPORT TQUnknownInterface* Q_STDCALL ucm_instantiate() \ Q_PLUGIN_INSTANTIATE( PLUGIN ) -# endif - #endif struct TQUnknownInterface; |