SOURCES: qt-fvisibility.patch (NEW) - Allows to compile kde with '...

adgor adgor at pld-linux.org
Mon Nov 14 16:09:07 CET 2005


Author: adgor                        Date: Mon Nov 14 15:09:07 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Allows to compile kde with '-fvisibility=hidden'
  & '-fvisibility-inlines-hidden' opts
  (see http://bugs.kde.org/show_bug.cgi?id=109386) 

---- Files affected:
SOURCES:
   qt-fvisibility.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/qt-fvisibility.patch
diff -u /dev/null SOURCES/qt-fvisibility.patch:1.1
--- /dev/null	Mon Nov 14 16:09:07 2005
+++ SOURCES/qt-fvisibility.patch	Mon Nov 14 16:09:02 2005
@@ -0,0 +1,66 @@
+Index: src/kernel/qgplugin.h
+===================================================================
+--- src/kernel/qgplugin.h	(revision 423270)
++++ src/kernel/qgplugin.h	(working copy)
+@@ -90,35 +90,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) QUnknownInterface* \
+-                __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) QUnknownInterface* 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 QUnknownInterface* ucm_instantiate() \
++	    Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
+             Q_PLUGIN_INSTANTIATE( PLUGIN )
+-#    endif
+-
+ #endif
+ 
+ struct QUnknownInterface;
+Index: src/tools/qglobal.h
+===================================================================
+--- src/tools/qglobal.h	(revision 423270)
++++ src/tools/qglobal.h	(working copy)
+@@ -865,6 +865,10 @@
+ #    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
+
================================================================



More information about the pld-cvs-commit mailing list