Changeset 86266 in webkit


Ignore:
Timestamp:
May 11, 2011 2:09:38 PM (13 years ago)
Author:
noam.rosenthal@nokia.com
Message:

2011-05-11 Noam Rosenthal <noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
https://bugs.webkit.org/show_bug.cgi?id=60439

Patch 3/12: TextureMapper shouldn't depend on OpenGL, but rather only allow the GL backend when
OpenGL is present.

No new tests. This is a build fix.

  • WebCore.pri:
  • WebCore.pro:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r86265 r86266  
     12011-05-11  Noam Rosenthal  <noam.rosenthal@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5
     6        [Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
     7        https://bugs.webkit.org/show_bug.cgi?id=60439
     8
     9        Patch 3/12: TextureMapper shouldn't depend on OpenGL, but rather only allow the GL backend when
     10        OpenGL is present.
     11
     12        No new tests. This is a build fix.
     13
     14        * WebCore.pri:
     15        * WebCore.pro:
     16
    1172011-05-11  Noam Rosenthal  <noam.rosenthal@nokia.com>
    218
  • trunk/Source/WebCore/WebCore.pri

    r86083 r86266  
    270270}
    271271
    272 contains(DEFINES, ENABLE_WEBGL=1)|contains(CONFIG, texmap) {
     272contains(DEFINES, ENABLE_WEBGL=1) {
    273273    !contains(QT_CONFIG, opengl) {
    274274        error( "This configuration needs an OpenGL enabled Qt. Your Qt is missing OpenGL.")
    275275    }
    276276    QT *= opengl
     277}
     278
     279contains(CONFIG, texmap) {
     280    DEFINES += WTF_USE_TEXTURE_MAPPER=1
     281    contains(QT_CONFIG, opengl) {
     282        QT *= opengl
     283    }
    277284}
    278285
  • trunk/Source/WebCore/WebCore.pro

    r86251 r86266  
    34893489
    34903490contains(CONFIG, texmap) {
    3491     DEFINES += WTF_USE_TEXTURE_MAPPER=1
    34923491    HEADERS += \
    34933492        platform/graphics/qt/TextureMapperQt.h \
Note: See TracChangeset for help on using the changeset viewer.