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 | |
| 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')
| -rw-r--r-- | src/kernel/qapplication_x11.cpp | 4 | ||||
| -rw-r--r-- | src/kernel/qgplugin.h | 36 | ||||
| -rw-r--r-- | src/kernel/qtextengine_p.h | 2 | ||||
| -rw-r--r-- | src/tools/qglobal.h | 4 |
4 files changed, 17 insertions, 29 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 54c91f48d..5011351b3 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -337,7 +337,7 @@ static long qt_mode_switch_remove_mask = 0; // flags for extensions for special Languages, currently only for RTL languages static bool qt_use_rtl_extensions = FALSE; -bool qt_hebrew_keyboard_hack = FALSE; +Q_EXPORT bool qt_hebrew_keyboard_hack = FALSE; static Window mouseActWindow = 0; // window where mouse is static int mouseButtonPressed = 0; // last mouse button pressed @@ -3851,7 +3851,7 @@ void qt_leave_modal( TQWidget *widget ) } -bool qt_try_modal( TQWidget *widget, XEvent *event ) +Q_EXPORT bool qt_try_modal( TQWidget *widget, XEvent *event ) { if (qt_xdnd_dragging) { // allow mouse events while DnD is active 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; diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h index a50ce901b..4858672c5 100644 --- a/src/kernel/qtextengine_p.h +++ b/src/kernel/qtextengine_p.h @@ -292,7 +292,7 @@ private: class TQFontPrivate; -class TQTextEngine { +class Q_EXPORT TQTextEngine { public: TQTextEngine( const TQString &str, TQFontPrivate *f ); ~TQTextEngine(); diff --git a/src/tools/qglobal.h b/src/tools/qglobal.h index cf0e1e440..74dab69e6 100644 --- a/src/tools/qglobal.h +++ b/src/tools/qglobal.h @@ -887,6 +887,10 @@ class TQDataStream; # define Q_TEMPLATE_EXTERN # undef Q_DISABLE_COPY /* avoid unresolved externals */ # endif +#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4 +# define Q_EXPORT __attribute__((visibility("default"))) +# undef QT_MAKEDLL /* ignore these for other platforms */ +# undef QT_DLL #else # undef QT_MAKEDLL /* ignore these for other platforms */ # undef QT_DLL |