778024 - Bug 774139 will break Qt/Maemo builds due to #define signals

Status: RESOLVED FIXED

(Core Graveyard :: Widget: Qt, defect)

Description

[Oleg Romashin (:romaxa)]

Attachment: Build fix for Qt Maemo N9

Followup for bug 774813 for maemo6 N9 build.
Haven't had time to build maemo that time
http://romaxa.info/fennec/mozilla-central/17.0a1.build.log
PluginProcessChild.cpp
c++ -o PluginProcessChild.o -c  -fvisibility=hidden -DMOZ_GLUE_IN_PROGRAM -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES  -DSTATIC_EXPORTABLE_JS_API -DEXCLUDE_SKIA_DEPENDENCIES  -DOS_LINUX=1 -DOS_POSIX=1  -DFORCE_PR_LOG -Idom/plugins/ipc/../base -Ixpcom/base/  -Iipc/chromium/src -Iipc/glue -I../../../ipc/ipdl/_ipdlheaders  -Idom/plugins/ipc -I. -I../../../dist/include  -Iobj-build/dist/include/nspr -Iobj-build/dist/include/nss      -fPIC  -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Wtype-limits -Wempty-body -Wno-ctor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wno-long-long -fno-exceptions -fno-strict-aliasing -ffunction-sections -fdata-sections -fno-exceptions -std=gnu++0x -pthread -pipe -DNDEBUG -DTRIMMED -gdwarf-2 -O3 -g -fomit-frame-pointer -DQT_SHARED -I/usr/include/meegotouch -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore   -DQT_SHARED -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtOpenGL   -DQT_SHARED -I/usr/include/qmsystem2 -I/usr/include/qt4 -I/usr/include/qt4/QtCore   -I/usr/include/qt4/QtMobility -I/usr/include/qt4/QtSensors -I/usr/include/qt4/QtFeedback -I/usr/include/qt4/QtLocation   -Iobj-build/dist/include/cairo   -DMOZILLA_CLIENT -include ../../../mozilla-config.h -MD -MF .deps/PluginProcessChild.o.pp dom/plugins/ipc/PluginProcessChild.cpp
In file included from ../../../dist/include/jsproxy.h:12,
                 from ../../../dist/include/dombindings.h:12,
                 from ../../../dist/include/nsDOMTouchEvent.h:13,
                 from ../../../dist/include/IPC/nsGUIEventIPC.h:10,
                 from ../../../ipc/ipdl/_ipdlheaders/mozilla/plugins/PPluginInstance.h:21,
                 from ../../../ipc/ipdl/_ipdlheaders/mozilla/plugins/PPluginInstanceChild.h:9,
                 from dom/plugins/ipc/PluginInstanceChild.h:10,
                 from dom/plugins/ipc/PluginInstanceChild.cpp:16:
../../../dist/include/jsfriendapi.h:316: error: expected unqualified-id before ';' token
../../../dist/include/jsfriendapi.h: In member function 'JS::Value& js::shadow::Object::slotRef(size_t) const':
../../../dist/include/jsfriendapi.h:328: error: expected primary-expression before '[' token
dom/plugins/ipc/PluginInstanceChild.cpp: In member function 'void mozilla::plugins::PluginInstanceChild::UpdateWindowAttributes(bool)':
dom/plugins/ipc/PluginInstanceChild.cpp:2976: warning: comparison between signed and unsigned integer expressions
make[6]: *** [PluginInstanceChild.o] Error 1
make[6]: *** Waiting for unfinished jobs....
In file included from ../../../dist/include/mozilla/plugins/PluginModuleParent.h:25,
                 from dom/plugins/ipc/PluginModuleParent.cpp:25:
../../../dist/include/mozilla/plugins/PluginInstanceParent.h: In member function 'void mozilla::plugins::PluginInstanceParent::DidComposite()':
../../../dist/include/mozilla/plugins/PluginInstanceParent.h:283: warning: ignoring return value of 'bool mozilla::plugins::PPluginInstanceParent::SendNPP_DidComposite()', declared with attribute warn_unused_result
make[6]: Leaving directory `obj-build/dom/plugins/ipc'

Comment 1

[Oleg Romashin (:romaxa)]

Attachment: One more followup for Harmattan N9 build related to bug 777094

Comment 2

[Oleg Romashin (:romaxa)]

https://hg.mozilla.org/mozilla-central/rev/278d4641b739

Comment 3

[Doug Turner (:dougt)]

Comment on attachment 646611 [details] [diff] [review]
One more followup for Harmattan N9 build related to bug 777094

Review of attachment 646611 [details] [diff] [review]:
-----------------------------------------------------------------

::: widget/qt/nsWindow.cpp
@@ +9,5 @@
>  
>  #include <QtOpenGL/QGLWidget>
>  #include <QtOpenGL/QGLContext>
> +// Solve conflict of qgl.h and GLDefs.h
> +#define GLdouble_defined 1

Have to do this sort of workaround is crap.  DO you want to just define this in configure?

Comment 4

[Oleg Romashin (:romaxa)]

This workaround does not work well everywhere...
so that is why I decided to move all this into wrapper class and remove workaround in https://bugzilla.mozilla.org/attachment.cgi?id=648395&action=edit