Bug 82042 – Unavailable pre-processor macro in non-Qt environments

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Víctor M. Jáquez L.]

I tried to compile WebKitGTK+ with this configuration:
    
/configure --prefix=/opt/jhbuild  \
           --with-accelerated-compositing=opengl \
           --with-gstreamer=0.10 \
           --enable-introspection
    
And my toolchain is: gcc (Debian 4.6.3-1) 4.6.3
    
When compiling I got a processor error given that QT_VERSION and QT_VERSION_CHECK are not available in my setup.

[Víctor M. Jáquez L.]

The error message is this:

  CXX    Source/WebCore/platform/graphics/texmap/libWebCore_la-TextureMapperGL.lo
Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:74:52: error: missing binary operator before token "("
make[1]: *** [Source/WebCore/platform/graphics/texmap/libWebCore_la-TextureMapperGL.lo] Error 1

[Víctor M. Jáquez L.]

Created attachment 133454 [details]
Patch proposal to fix missing symbols in non-Qt environments

[Víctor M. Jáquez L.]

I add Kenneth because he reviewed the bug 81113 which patch introduced this bug.

[Early Warning System Bot]

Comment on attachment 133454 [details]
Patch proposal to fix missing symbols in non-Qt environments

Attachment 133454 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/12114563

[Xan Lopez]

Comment on attachment 133454 [details]
Patch proposal to fix missing symbols in non-Qt environments

View in context: https://bugs.webkit.org/attachment.cgi?id=133454&action=review

> Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:-74
> -#if PLATFORM(QT) && (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))

This seems to fail in the Qt EWS becasue they don't have Qt5 so GLContext is not defined (so I'd say the code was wrong to begin with?).

Other than that I'm not quite sure why the change in the preprocessor stuff is needed, I'd expect && to do the right thing and shortcircuit evaluation.

[Víctor M. Jáquez L.]

I realized that my patch did not provides a valid path when Qt is previous than 5.0

I'll provide a new version of it after.

[Víctor M. Jáquez L.]

Created attachment 133487 [details]
Patch proposal to fix missing symbols in non-Qt environments

[Simon Hausmann]

Comment on attachment 133487 [details]
Patch proposal to fix missing symbols in non-Qt environments

I'd prefer if this was written without QT_VERSION_CHECK instead of introducing _QT5, i.e.:

#if PLATFORM(QT) && QT_VERSION >= 0x050000

[Víctor M. Jáquez L.]

Created attachment 134023 [details]
Patch proposal to fix missing symbols in non-Qt environments v3

[Víctor M. Jáquez L.]

(In reply to comment #8)
> (From update of attachment 133487 [details])
> I'd prefer if this was written without QT_VERSION_CHECK instead of introducing _QT5, i.e.:
> 
> #if PLATFORM(QT) && QT_VERSION >= 0x050000

The version 3 of the patch uses this approach. Thanks!

[Simon Hausmann]

(In reply to comment #10)
> (In reply to comment #8)
> > (From update of attachment 133487 [details] [details])
> > I'd prefer if this was written without QT_VERSION_CHECK instead of introducing _QT5, i.e.:
> > 
> > #if PLATFORM(QT) && QT_VERSION >= 0x050000
> 
> The version 3 of the patch uses this approach. Thanks!

I suggest to mark the patch for review (r?) in order for the EWS to start building and us being able to review it :)

[Víctor M. Jáquez L.]

(In reply to comment #11)
> (In reply to comment #10)
> > (In reply to comment #8)
> > > (From update of attachment 133487 [details] [details] [details])
> > > I'd prefer if this was written without QT_VERSION_CHECK instead of introducing _QT5, i.e.:
> > > 
> > > #if PLATFORM(QT) && QT_VERSION >= 0x050000
> > 
> > The version 3 of the patch uses this approach. Thanks!
> 
> I suggest to mark the patch for review (r?) in order for the EWS to start building and us being able to review it :)

Oops! I guess now it's correct. Thanks!

[Víctor M. Jáquez L.]

Comment on attachment 134023 [details]
Patch proposal to fix missing symbols in non-Qt environments v3

Simon would you, please, add the c-q + in this patch, because I'm not a committer. Thanks!

[WebKit Review Bot]

Comment on attachment 134023 [details]
Patch proposal to fix missing symbols in non-Qt environments v3

Clearing flags on attachment: 134023

Committed r112530: <http://trac.webkit.org/changeset/112530>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.