Contents of /trunk/qt/patches/qt-3.3.8-visibility.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5554 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5554 byte(s)
-import
1 | Index: configure |
2 | =================================================================== |
3 | --- configure (revision 471775) |
4 | +++ configure (working copy) |
5 | @@ -1053,6 +1053,7 @@ |
6 | [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools |
7 | cat > $outpath/src/tools/qconfig.cpp.new <<EOF |
8 | /* Install paths from configure */ |
9 | +#include "qglobal.h" |
10 | |
11 | static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=$QT_INSTALL_PREFIX"; |
12 | static const char QT_INSTALL_BINS [267] = "qt_binpath=$QT_INSTALL_BINS"; |
13 | Index: src/kernel/qgplugin.h |
14 | =================================================================== |
15 | --- src/kernel/qgplugin.h (revision 471775) |
16 | +++ src/kernel/qgplugin.h (working copy) |
17 | @@ -90,35 +90,19 @@ |
18 | return i->iface(); \ |
19 | } |
20 | |
21 | -# ifdef Q_WS_WIN |
22 | -# ifdef Q_CC_BOR |
23 | -# define Q_EXPORT_PLUGIN(PLUGIN) \ |
24 | - Q_PLUGIN_VERIFICATION_DATA \ |
25 | - Q_EXTERN_C __declspec(dllexport) \ |
26 | - const char * __stdcall qt_ucm_query_verification_data() \ |
27 | - { return qt_ucm_verification_data; } \ |
28 | - Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \ |
29 | - __stdcall ucm_instantiate() \ |
30 | - Q_PLUGIN_INSTANTIATE( PLUGIN ) |
31 | -# else |
32 | -# define Q_EXPORT_PLUGIN(PLUGIN) \ |
33 | - Q_PLUGIN_VERIFICATION_DATA \ |
34 | - Q_EXTERN_C __declspec(dllexport) \ |
35 | - const char *qt_ucm_query_verification_data() \ |
36 | - { return qt_ucm_verification_data; } \ |
37 | - Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \ |
38 | - Q_PLUGIN_INSTANTIATE( PLUGIN ) |
39 | -# endif |
40 | -# else |
41 | -# define Q_EXPORT_PLUGIN(PLUGIN) \ |
42 | +#if defined(Q_WS_WIN) && defined(Q_CC_BOR) |
43 | +# define Q_STDCALL __stdcall |
44 | +#else |
45 | +# define Q_STDCALL |
46 | +#endif |
47 | + |
48 | +#define Q_EXPORT_PLUGIN(PLUGIN) \ |
49 | Q_PLUGIN_VERIFICATION_DATA \ |
50 | - Q_EXTERN_C \ |
51 | - const char *qt_ucm_query_verification_data() \ |
52 | + Q_EXTERN_C Q_EXPORT \ |
53 | + const char * Q_STDCALL qt_ucm_query_verification_data() \ |
54 | { return qt_ucm_verification_data; } \ |
55 | - Q_EXTERN_C QUnknownInterface* ucm_instantiate() \ |
56 | + Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \ |
57 | Q_PLUGIN_INSTANTIATE( PLUGIN ) |
58 | -# endif |
59 | - |
60 | #endif |
61 | |
62 | struct QUnknownInterface; |
63 | Index: src/kernel/qapplication_x11.cpp |
64 | =================================================================== |
65 | --- src/kernel/qapplication_x11.cpp (revision 471775) |
66 | +++ src/kernel/qapplication_x11.cpp (working copy) |
67 | @@ -314,7 +314,7 @@ |
68 | |
69 | // flags for extensions for special Languages, currently only for RTL languages |
70 | static bool qt_use_rtl_extensions = FALSE; |
71 | -bool qt_hebrew_keyboard_hack = FALSE; |
72 | +Q_EXPORT bool qt_hebrew_keyboard_hack = FALSE; |
73 | |
74 | static Window mouseActWindow = 0; // window where mouse is |
75 | static int mouseButtonPressed = 0; // last mouse button pressed |
76 | @@ -3800,7 +3800,7 @@ |
77 | } |
78 | |
79 | |
80 | -bool qt_try_modal( QWidget *widget, XEvent *event ) |
81 | +Q_EXPORT bool qt_try_modal( QWidget *widget, XEvent *event ) |
82 | { |
83 | if (qt_xdnd_dragging) { |
84 | // allow mouse events while DnD is active |
85 | Index: src/kernel/qtextengine_p.h |
86 | =================================================================== |
87 | --- src/kernel/qtextengine_p.h (revision 471775) |
88 | +++ src/kernel/qtextengine_p.h (working copy) |
89 | @@ -280,7 +280,7 @@ |
90 | |
91 | class QFontPrivate; |
92 | |
93 | -class QTextEngine { |
94 | +class Q_EXPORT QTextEngine { |
95 | public: |
96 | QTextEngine( const QString &str, QFontPrivate *f ); |
97 | ~QTextEngine(); |
98 | Index: src/tools/qglobal.h |
99 | =================================================================== |
100 | --- src/tools/qglobal.h (revision 471775) |
101 | +++ src/tools/qglobal.h (working copy) |
102 | @@ -865,6 +865,10 @@ |
103 | # define Q_TEMPLATE_EXTERN |
104 | # undef Q_DISABLE_COPY /* avoid unresolved externals */ |
105 | # endif |
106 | +#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4 |
107 | +# define Q_EXPORT __attribute__((visibility("default"))) |
108 | +# undef QT_MAKEDLL /* ignore these for other platforms */ |
109 | +# undef QT_DLL |
110 | #else |
111 | # undef QT_MAKEDLL /* ignore these for other platforms */ |
112 | # undef QT_DLL |
113 | Index: tools/designer/uilib/qwidgetfactory.h |
114 | =================================================================== |
115 | --- tools/designer/uilib/qwidgetfactory.h (revision 471775) |
116 | +++ tools/designer/uilib/qwidgetfactory.h (working copy) |
117 | @@ -48,7 +48,7 @@ |
118 | class QWidgetFactoryPrivate; |
119 | class UibStrTable; |
120 | |
121 | -class QWidgetFactory |
122 | +class Q_EXPORT QWidgetFactory |
123 | { |
124 | public: |
125 | QWidgetFactory(); |
126 | Index: tools/designer/uilib/qwidgetfactory.cpp |
127 | =================================================================== |
128 | --- tools/designer/uilib/qwidgetfactory.cpp (revision 471775) |
129 | +++ tools/designer/uilib/qwidgetfactory.cpp (working copy) |
130 | @@ -113,13 +113,13 @@ |
131 | static QMap<QString, bool> *availableWidgetMap = 0; |
132 | static QStringList *availableWidgetList = 0; |
133 | |
134 | -QMap<QWidget*, QString> *qwf_forms = 0; |
135 | +Q_EXPORT QMap<QWidget*, QString> *qwf_forms = 0; |
136 | QString *qwf_language = 0; |
137 | -bool qwf_execute_code = TRUE; |
138 | +Q_EXPORT bool qwf_execute_code = TRUE; |
139 | bool qwf_stays_on_top = FALSE; |
140 | QString qwf_currFileName = ""; |
141 | QObject *qwf_form_object = 0; |
142 | -QString *qwf_plugin_dir = 0; |
143 | +Q_EXPORT QString *qwf_plugin_dir = 0; |
144 | |
145 | static void setupPluginDir() |
146 | { |
147 | Index: tools/designer/shared/domtool.h |
148 | =================================================================== |
149 | --- tools/designer/shared/domtool.h (revision 471775) |
150 | +++ tools/designer/shared/domtool.h (working copy) |
151 | @@ -33,7 +33,7 @@ |
152 | class QDomElement; |
153 | class QDomDocument; |
154 | |
155 | -class DomTool : public Qt |
156 | +class Q_EXPORT DomTool : public Qt |
157 | { |
158 | public: |
159 | static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ); |