Changeset 109552 in webkit
- Timestamp:
- Mar 2, 2012 4:16:39 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r109544 r109552 1 2012-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 1 11 2012-03-02 Byungwoo Lee <bw80.lee@samsung.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r109551 r109552 1 2012-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 1 12 2012-03-02 Yoshifumi Inoue <yosin@chromium.org> 2 13 -
trunk/Source/WebCore/Target.pri
r109542 r109552 20 20 # Add a QtScript dependency for the time being, in order to pull in the include 21 21 # path for QtScript when it's built as a standalone module 22 QT += script widgets22 QT += script 23 23 } else { 24 24 INCLUDEPATH += $$PWD/../JavaScriptCore/wtf/qt/compat -
trunk/Source/WebCore/WebCore.pri
r109493 r109552 185 185 error( "This configuration needs an OpenGL enabled Qt. Your Qt is missing OpenGL.") 186 186 } 187 QT *= opengl188 187 } 189 188 … … 191 190 DEFINES += WTF_USE_TEXTURE_MAPPER=1 192 191 !win32-*:contains(QT_CONFIG, opengl) { 193 DEFINES += WTF_USE_TEXTURE_MAPPER_GL 194 QT *= opengl 192 DEFINES += WTF_USE_TEXTURE_MAPPER_GL=1 195 193 contains(QT_CONFIG, opengles2): LIBS += -lEGL 196 194 } 195 } 196 197 contains(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 197 200 } 198 201 -
trunk/Source/WebKit2/ChangeLog
r109548 r109552 1 2012-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 1 12 2012-03-02 Allan Sandfeld Jensen <allan.jensen@nokia.com> 2 13 -
trunk/Source/WebKit2/Shared/qt/WebEventFactoryQt.cpp
r108643 r109552 27 27 #include "config.h" 28 28 #include "WebEventFactoryQt.h" 29 #include <qgraphicssceneevent.h>30 29 #include <QApplication> 31 30 #include <QKeyEvent> -
trunk/Source/WebKit2/Target.pri
r109241 r109552 13 13 14 14 WEBKIT += wtf javascriptcore webcore 15 QT += declarative quick quick-private 15 QT += declarative quick quick-private widgets 16 16 17 17 CONFIG += staticlib -
trunk/Source/api.pri
r109542 r109552 34 34 haveQt(5): QT += widgets printsupport quick 35 35 36 win32*:!win32-msvc* { 36 contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1)|contains(DEFINES, ENABLE_WEBGL=1) { 37 QT *= opengl 37 38 # 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_OPENGL39 win32*:!win32-msvc*: LIBS += $$QMAKE_LIBS_OPENGL 39 40 } 40 41
Note: See TracChangeset
for help on using the changeset viewer.