Changeset 109552 in webkit


Ignore:
Timestamp:
Mar 2, 2012 4:16:39 AM (12 years ago)
Author:
Simon Hausmann
Message:

[Qt] Compile WebCore without QtWidgets
https://bugs.webkit.org/show_bug.cgi?id=80141

Reviewed by Tor Arne Vestbø.

.:

  • Source/api.pri: Use QT += opengl for the WebKit1 bits, such as the QGLWidget

usage in PageClientQt.cpp. Previously this dependency came implicitly through WebCore.pri.

Source/WebCore:

  • Target.pri: Don't add widgets to QT.
  • WebCore.pri: Use QT += opengl only with Qt 4, because it has an implicit QtWidgets

dependency. With Qt 5 all necessary OpenGL API is part of QtGui (with a QOpenGL* prefix).

Source/WebKit2:

  • Shared/qt/WebEventFactoryQt.cpp: Removed unnecessary include.
  • Target.pri: Require widgets for WK2 for the moment, until bug #79458

is fixed.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r109544 r109552  
     12012-03-02  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        [Qt] Compile WebCore without QtWidgets
     4        https://bugs.webkit.org/show_bug.cgi?id=80141
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * Source/api.pri: Use QT += opengl for the WebKit1 bits, such as the QGLWidget
     9        usage in PageClientQt.cpp. Previously this dependency came implicitly through WebCore.pri.
     10
    1112012-03-02  Byungwoo Lee  <bw80.lee@samsung.com>
    212
  • trunk/Source/WebCore/ChangeLog

    r109551 r109552  
     12012-03-02  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        [Qt] Compile WebCore without QtWidgets
     4        https://bugs.webkit.org/show_bug.cgi?id=80141
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * Target.pri: Don't add widgets to QT.
     9        * WebCore.pri: Use QT += opengl only with Qt 4, because it has an implicit QtWidgets
     10        dependency. With Qt 5 all necessary OpenGL API is part of QtGui (with a QOpenGL* prefix).
     11
    1122012-03-02  Yoshifumi Inoue  <yosin@chromium.org>
    213
  • trunk/Source/WebCore/Target.pri

    r109542 r109552  
    2020    # Add a QtScript dependency for the time being, in order to pull in the include
    2121    # path for QtScript when it's built as a standalone module
    22     QT += script widgets
     22    QT += script
    2323} else {
    2424    INCLUDEPATH += $$PWD/../JavaScriptCore/wtf/qt/compat
  • trunk/Source/WebCore/WebCore.pri

    r109493 r109552  
    185185        error( "This configuration needs an OpenGL enabled Qt. Your Qt is missing OpenGL.")
    186186    }
    187     QT *= opengl
    188187}
    189188
     
    191190    DEFINES += WTF_USE_TEXTURE_MAPPER=1
    192191    !win32-*:contains(QT_CONFIG, opengl) {
    193         DEFINES += WTF_USE_TEXTURE_MAPPER_GL
    194         QT *= opengl
     192        DEFINES += WTF_USE_TEXTURE_MAPPER_GL=1
    195193        contains(QT_CONFIG, opengles2): LIBS += -lEGL
    196194    }
     195}
     196
     197contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1)|contains(DEFINES, ENABLE_WEBGL=1) {
     198    # Only Qt 4 needs the opengl module, for Qt 5 everything we need is part of QtGui.
     199    haveQt(4): QT *= opengl
    197200}
    198201
  • trunk/Source/WebKit2/ChangeLog

    r109548 r109552  
     12012-03-02  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        [Qt] Compile WebCore without QtWidgets
     4        https://bugs.webkit.org/show_bug.cgi?id=80141
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * Shared/qt/WebEventFactoryQt.cpp: Removed unnecessary include.
     9        * Target.pri: Require widgets for WK2 for the moment, until bug #79458
     10        is fixed.
     11
    1122012-03-02  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
    213
  • trunk/Source/WebKit2/Shared/qt/WebEventFactoryQt.cpp

    r108643 r109552  
    2727#include "config.h"
    2828#include "WebEventFactoryQt.h"
    29 #include <qgraphicssceneevent.h>
    3029#include <QApplication>
    3130#include <QKeyEvent>
  • trunk/Source/WebKit2/Target.pri

    r109241 r109552  
    1313
    1414WEBKIT += wtf javascriptcore webcore
    15 QT += declarative quick quick-private
     15QT += declarative quick quick-private widgets
    1616
    1717CONFIG += staticlib
  • trunk/Source/api.pri

    r109542 r109552  
    3434haveQt(5): QT += widgets printsupport quick
    3535
    36 win32*:!win32-msvc* {
     36contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1)|contains(DEFINES, ENABLE_WEBGL=1) {
     37    QT *= opengl
    3738    # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
    38     contains(DEFINES, ENABLE_WEBGL=1)|contains(CONFIG, texmap): LIBS += $$QMAKE_LIBS_OPENGL
     39    win32*:!win32-msvc*: LIBS += $$QMAKE_LIBS_OPENGL
    3940}
    4041
Note: See TracChangeset for help on using the changeset viewer.