File libqt4-4.8.4-fix-compilation.diff of Package mingw32-libqt4-opensource-4.8.6

Overview Repositories Revisions Requests Users Attributes Meta

File libqt4-4.8.4-fix-compilation.diff of Package mingw32-libqt4-opensource-4.8.6 (Revision 6add91929baec45cfb6638cfa91cc53a)

Currently displaying revision 6add91929baec45cfb6638cfa91cc53a , Show latest

diff --git src.orig/activeqt/control/qaxserverbase.cpp src/activeqt/control/qaxserverbase.cpp
index f5c495a..123e40f 100644
--- src.orig/activeqt/control/qaxserverbase.cpp
+++ src/activeqt/control/qaxserverbase.cpp
@@ -4037,12 +4037,10 @@ HRESULT WINAPI QAxServerBase::SetColorScheme(LOGPALETTE*)
 }
 
 
-#ifdef QT_DLL // avoid conflict with symbol in static lib
 bool qt_sendSpontaneousEvent(QObject *o, QEvent *e)
 {
     return QCoreApplication::sendSpontaneousEvent(o, e);
 }
-#endif
 
 /*
     Tries to set the size of the control.
diff --git tools.orig/activeqt/testcon/testcon.pro tools/activeqt/testcon/testcon.pro
index 89f8067..696be2e 100644
--- tools.orig/activeqt/testcon/testcon.pro
+++ tools/activeqt/testcon/testcon.pro
@@ -7,6 +7,7 @@ CONFIG	+= qaxserver qaxserver_no_postlink qaxcontainer
 INCLUDEPATH += $$QT_SOURCE_TREE/tools/activeqt/container/debug \
     $$QT_SOURCE_TREE/tools/activeqt/container/release \
     $$QT_BUILD_TREE/src/activeqt/container \
+    $$QT_BUILD_TREE/src/activeqt/container/.uic/release-shared \
 
 SOURCES	 = main.cpp docuwindow.cpp mainwindow.cpp invokemethod.cpp changeproperties.cpp ambientproperties.cpp controlinfo.cpp
 HEADERS	 = docuwindow.h mainwindow.h invokemethod.h changeproperties.h ambientproperties.h controlinfo.h
diff --git tools.orig/designer/src/plugins/activeqt/activeqt.pro tools/designer/src/plugins/activeqt/activeqt.pro
index f58df8a..5d9bdd4 100644
--- tools.orig/designer/src/plugins/activeqt/activeqt.pro
+++ tools/designer/src/plugins/activeqt/activeqt.pro
@@ -10,6 +10,7 @@ build_all:!build_pass {
 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/activeqt/shared/ \
                $$QT_BUILD_TREE/src/activeqt/container \
+	       $$QT_BUILD_TREE/src/activeqt/container/.uic/release-shared \
                ../../lib/uilib
 
 # Input

Places

File libqt4-4.8.4-fix-compilation.diff of Package mingw32-libqt4-opensource-4.8.6 (Revision 6add91929baec45cfb6638cfa91cc53a)

Places