Attachment #223 for bug #696

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 696
Collapse All | Expand All

Lines 1080-1085 Link Here

(-)tqt3.orig/configure (+1 lines)
1080	[ -d $outpath/src/tools ] \|\| mkdir -p $outpath/src/tools	1080	[ -d $outpath/src/tools ] \|\| mkdir -p $outpath/src/tools
1081	cat > $outpath/src/tools/qconfig.cpp.new <<EOF	1081	cat > $outpath/src/tools/qconfig.cpp.new <<EOF
1082	/* Install paths from configure */	1082	/* Install paths from configure */
		1083	#include "qglobal.h"
1083		1084
1084	static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=$QT_INSTALL_PREFIX";	1085	static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=$QT_INSTALL_PREFIX";
1085	static const char QT_INSTALL_BINS [267] = "qt_binpath=$QT_INSTALL_BINS";	1086	static const char QT_INSTALL_BINS [267] = "qt_binpath=$QT_INSTALL_BINS";

Lines 16-22 Link Here

(-)tqt3.orig/mkspecs/linux-g++/qmake.conf (-1 / +1 lines)
16	QMAKE_YACCFLAGS_MANGLE = -p $base -b $base	16	QMAKE_YACCFLAGS_MANGLE = -p $base -b $base
17	QMAKE_YACC_HEADER = $base.tab.h	17	QMAKE_YACC_HEADER = $base.tab.h
18	QMAKE_YACC_SOURCE = $base.tab.c	18	QMAKE_YACC_SOURCE = $base.tab.c
19	QMAKE_CFLAGS = -pipe -g	19	QMAKE_CFLAGS = -pipe -g -fvisibility=hidden -fvisibility-inlines-hidden
20	QMAKE_CFLAGS_DEPS = -M	20	QMAKE_CFLAGS_DEPS = -M
21	QMAKE_CFLAGS_WARN_ON = -Wall -W	21	QMAKE_CFLAGS_WARN_ON = -Wall -W
22	QMAKE_CFLAGS_WARN_OFF = -w	22	QMAKE_CFLAGS_WARN_OFF = -w

Lines 337-343 Link Here

(-)tqt3.orig/src/kernel/qapplication_x11.cpp (-2 / +2 lines)
337		337
338	// flags for extensions for special Languages, currently only for RTL languages	338	// flags for extensions for special Languages, currently only for RTL languages
339	static bool qt_use_rtl_extensions = FALSE;	339	static bool qt_use_rtl_extensions = FALSE;
340	bool qt_hebrew_keyboard_hack = FALSE;	340	Q_EXPORT bool qt_hebrew_keyboard_hack = FALSE;
341		341
342	static Window mouseActWindow = 0; // window where mouse is	342	static Window mouseActWindow = 0; // window where mouse is
343	static int mouseButtonPressed = 0; // last mouse button pressed	343	static int mouseButtonPressed = 0; // last mouse button pressed
Lines 3851-3857 Link Here
3851	}	3851	}
3852		3852
3853		3853
3854	bool qt_try_modal( TQWidget widget, XEvent event )	3854	Q_EXPORT bool qt_try_modal( TQWidget widget, XEvent event )
3855	{	3855	{
3856	if (qt_xdnd_dragging) {	3856	if (qt_xdnd_dragging) {
3857	// allow mouse events while DnD is active	3857	// allow mouse events while DnD is active




	    return i->iface(); \
	}

#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
#   define Q_STDCALL __stdcall
#else
#   define Q_STDCALL
#endif

#define Q_EXPORT_PLUGIN(PLUGIN) \
		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) \
	    Q_PLUGIN_VERIFICATION_DATA \
	    Q_EXTERN_C Q_EXPORT \
            const char * Q_STDCALL qt_ucm_query_verification_data() \
            { return qt_ucm_verification_data; } \
	    Q_EXTERN_C Q_EXPORT TQUnknownInterface* Q_STDCALL ucm_instantiate() \
            Q_PLUGIN_INSTANTIATE( PLUGIN )
#    endif

#endif

struct TQUnknownInterface;

Lines 292-298 Link Here

(-)tqt3.orig/src/kernel/qtextengine_p.h (-1 / +1 lines)
292		292
293	class TQFontPrivate;	293	class TQFontPrivate;
294		294
295	class TQTextEngine {	295	class Q_EXPORT TQTextEngine {
296	public:	296	public:
297	TQTextEngine( const TQString &str, TQFontPrivate *f );	297	TQTextEngine( const TQString &str, TQFontPrivate *f );
298	~TQTextEngine();	298	~TQTextEngine();

Lines 887-892 Link Here

(-)tqt3.orig/src/tools/qglobal.h (+4 lines)
887	# define Q_TEMPLATE_EXTERN	887	# define Q_TEMPLATE_EXTERN
888	# undef Q_DISABLE_COPY /* avoid unresolved externals */	888	# undef Q_DISABLE_COPY /* avoid unresolved externals */
889	# endif	889	# endif
		890	#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
		891	# define Q_EXPORT __attribute__((visibility("default")))
		892	# undef QT_MAKEDLL /* ignore these for other platforms */
		893	# undef QT_DLL
890	#else	894	#else
891	# undef QT_MAKEDLL /* ignore these for other platforms */	895	# undef QT_MAKEDLL /* ignore these for other platforms */
892	# undef QT_DLL	896	# undef QT_DLL

Lines 40-46 Link Here

(-)tqt3.orig/tools/designer/shared/domtool.h (-1 / +1 lines)
40	class TQDomElement;	40	class TQDomElement;
41	class TQDomDocument;	41	class TQDomDocument;
42		42
43	class DomTool : public TQt	43	class Q_EXPORT DomTool : public TQt
44	{	44	{
45	public:	45	public:
46	static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue );	46	static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue );




static TQMap<TQString, bool> *availableWidgetMap = 0;
static TQStringList *availableWidgetList = 0;

Q_EXPORT TQMap<TQWidget*, TQString> *qwf_forms = 0;
TQString *qwf_language = 0;
Q_EXPORT bool qwf_execute_code = TRUE;
bool qwf_stays_on_top = FALSE;
TQString qwf_currFileName = "";
TQObject *qwf_form_object = 0;
Q_EXPORT TQString *qwf_plugin_dir = 0;

static void setupPluginDir()
{

Lines 55-61 Link Here

(-)tqt3.orig/tools/designer/uilib/qwidgetfactory.h (-1 / +1 lines)
55	class TQWidgetFactoryPrivate;	55	class TQWidgetFactoryPrivate;
56	class UibStrTable;	56	class UibStrTable;
57		57
58	class TQWidgetFactory	58	class Q_EXPORT TQWidgetFactory
59	{	59	{
60	public:	60	public:
61	TQWidgetFactory();	61	TQWidgetFactory();

Return to bug 696

Lines 120-132 Link Here

(-)tqt3.orig/tools/designer/uilib/qwidgetfactory.cpp (-3 / +3 lines)
120	static TQMap<TQString, bool> *availableWidgetMap = 0;	120	static TQMap<TQString, bool> *availableWidgetMap = 0;
121	static TQStringList *availableWidgetList = 0;	121	static TQStringList *availableWidgetList = 0;
122		122
123	TQMap<TQWidget, TQString> qwf_forms = 0;	123	Q_EXPORT TQMap<TQWidget, TQString> qwf_forms = 0;
124	TQString *qwf_language = 0;	124	TQString *qwf_language = 0;
125	bool qwf_execute_code = TRUE;	125	Q_EXPORT bool qwf_execute_code = TRUE;
126	bool qwf_stays_on_top = FALSE;	126	bool qwf_stays_on_top = FALSE;
127	TQString qwf_currFileName = "";	127	TQString qwf_currFileName = "";
128	TQObject *qwf_form_object = 0;	128	TQObject *qwf_form_object = 0;
129	TQString *qwf_plugin_dir = 0;	129	Q_EXPORT TQString *qwf_plugin_dir = 0;
130		130
131	static void setupPluginDir()	131	static void setupPluginDir()
132	{	132	{

Lines 93-127 Link Here

(-)tqt3.orig/src/kernel/qgplugin.h (-26 / +10 lines)
93	return i->iface(); \	93	return i->iface(); \
94	}	94	}
95		95
96	# ifdef Q_WS_WIN	96	#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
97	# ifdef Q_CC_BOR	97	# define Q_STDCALL __stdcall
98	# define Q_EXPORT_PLUGIN(PLUGIN) \	98	#else
99	Q_PLUGIN_VERIFICATION_DATA \	99	# define Q_STDCALL
100	Q_EXTERN_C __declspec(dllexport) \	100	#endif
101	const char * __stdcall qt_ucm_query_verification_data() \	101
102	{ return qt_ucm_verification_data; } \	102	#define Q_EXPORT_PLUGIN(PLUGIN) \
103	Q_EXTERN_C __declspec(dllexport) TQUnknownInterface* \
104	__stdcall ucm_instantiate() \
105	Q_PLUGIN_INSTANTIATE( PLUGIN )
106	# else
107	# define Q_EXPORT_PLUGIN(PLUGIN) \
108	Q_PLUGIN_VERIFICATION_DATA \
109	Q_EXTERN_C __declspec(dllexport) \
110	const char *qt_ucm_query_verification_data() \
111	{ return qt_ucm_verification_data; } \
112	Q_EXTERN_C __declspec(dllexport) TQUnknownInterface* ucm_instantiate() \
113	Q_PLUGIN_INSTANTIATE( PLUGIN )
114	# endif
115	# else
116	# define Q_EXPORT_PLUGIN(PLUGIN) \
117	Q_PLUGIN_VERIFICATION_DATA \	103	Q_PLUGIN_VERIFICATION_DATA \
118	Q_EXTERN_C \	104	Q_EXTERN_C Q_EXPORT \
119	const char *qt_ucm_query_verification_data() \	105	const char * Q_STDCALL qt_ucm_query_verification_data() \
120	{ return qt_ucm_verification_data; } \	106	{ return qt_ucm_verification_data; } \
121	Q_EXTERN_C TQUnknownInterface* ucm_instantiate() \	107	Q_EXTERN_C Q_EXPORT TQUnknownInterface* Q_STDCALL ucm_instantiate() \
122	Q_PLUGIN_INSTANTIATE( PLUGIN )	108	Q_PLUGIN_INSTANTIATE( PLUGIN )
123	# endif
124
125	#endif	109	#endif
126		110
127	struct TQUnknownInterface;	111	struct TQUnknownInterface;