101249 2012-11-05 13:27:03 -0800 [Qt4] QtWebKit-2.3 tries to open non-existent qopengl.h 2012-11-07 06:24:47 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P3 Normal --- 88186 0 chombourger webkit-unassigned allan.jensen dino noam webkit.review.bot oldest_to_newest 758826 0 chombourger 2012-11-05 13:27:03 -0800 While trying to build QtWebKit-2.3 for an OpenGL ES2 platform running Qt 4.8.1, build of abd77b3f85375632aa313934e8eb9ae89f2bbf2e (git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit-23.git) fails with many errors from Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h. The first error raised is: Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h:35:21: error: qopengl.h: No such file or directory Subsequent errors are simply caused by the above. The following is an excerpt of Extensions3DOpenGLES.h: #include "Extensions3DOpenGLCommon.h" #if PLATFORM(QT) // Takes care of declaring the GLES extensions. #include <qopengl.h> #else #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> #endif The #include <opengl.h> has been added with the following commit: commit 782d2b09837c843a4afbae149e6c6b22bf1b3870 Author: commit-queue <commit-queue@webkit.org> Date: Tue Sep 18 12:21:44 2012 +0000 Fix compilation with Qt 5 on MeeGo 1.2 Harmattan https://bugs.webkit.org/show_bug.cgi?id=96937 Patch by Simon Hausmann <simon.hausmann@digia.com> on 2012-09-18 Reviewed by Jocelyn Turcotte. The gl2ext.h header file on the platform is outdated. Instead use the newer copy from Qt through implicit inclusion of qopengl.h. Since Qt's declarations are based on newer Khronos headers, the multi sampling extensions do have the PROC suffix, we need the same workaround as QNX. * platform/graphics/opengl/Extensions3DOpenGLES.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128877 268f45cc-cd09-0410-ab3c-d52691b4dbfc A simple work-around is to add " && HAVE(QT5)" to "#if PLATFORM(QT)" 758868 1 172399 chombourger 2012-11-05 14:03:46 -0800 Created attachment 172399 proposed patch 758880 2 webkit.review.bot 2012-11-05 14:08:30 -0800 Attachment 172399 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:11: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:12: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:13: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:14: Line contains tab character. [whitespace/tab] [5] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 758890 3 172404 chombourger 2012-11-05 14:15:02 -0800 Created attachment 172404 proposed patch 760559 4 allan.jensen 2012-11-07 05:23:29 -0800 Does it also work if you include qgl.h instead of qopengl.h ? 760631 5 172404 allan.jensen 2012-11-07 06:20:22 -0800 Comment on attachment 172404 proposed patch Qt4 specific changes are no longer commited to trunk, but I will apply it on QtWebKit2.3 760634 6 allan.jensen 2012-11-07 06:24:47 -0800 Commited as 93525bce7330e0b56f186140b6a053a4f3dbf9a4 and pushed in qtwebkit-2.3-staging 172399 2012-11-05 14:03:46 -0800 2012-11-05 14:26:52 -0800 proposed patch 0001-Include-qopengl.h-only-when-building-against-Qt5.patch text/plain 2001 chombourger RnJvbSA3ODQ1YjFmZjUwNTI4Zjk4MTUyMTMwZDZhNTM2Mjg5NTkwMWQ1OTY2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDZWRyaWMgSG9tYm91cmdlciA8Y2hvbWJvdXJnZXJAbXZpc3Rh LmNvbT4KRGF0ZTogTW9uLCA1IE5vdiAyMDEyIDIxOjQyOjQ0ICswMDAwClN1YmplY3Q6IFtQQVRD SF0gSW5jbHVkZSBxb3BlbmdsLmggb25seSB3aGVuIGJ1aWxkaW5nIGFnYWluc3QgUXQ1CgotLS0K IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAy MCArKysrKysrKysrKysrKysrKysrKwogLi4uL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RP cGVuR0xFUy5oICAgICAgICAgfCAgICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlv bnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMzMTE3MDQuLjRmOTM1MjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0xMS0wNSAgQ2VkcmljIEhvbWJvdXJnZXIg IDxjaG9tYm91cmdlckBtdmlzdGEuY29tPgorCisgICAgICAgIEluY2x1ZGUgcW9wZW5nbC5oIG9u bHkgd2hlbiBidWlsZGluZyBhZ2FpbnN0IFF0NQorCisgICAgICAgIFtRdF0gUXRXZWJLaXQtMi4z IHRyaWVzIHRvIG9wZW4gbm9uLWV4aXN0ZW50IHFvcGVuZ2wuaAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjQ5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUXQ1IGFkZHMgcW9wZW5nbC5oIHRvIHRha2Ug Y2FyZSBvZiBhbGwgdGhlIE9wZW5HTCAjaW5jbHVkZXMKKwlyZXF1aXJlZCBmb3IgdGhlIHRhcmdl dCBwbGF0Zm9ybS4gVW5mb3J0dW5hdGVseSB0aGlzIGhlYWRlciBkb2VzCisJbm90IGV4aXN0IGlu IFF0IDQuOCBhbmQgYnVpbGRpbmcgb2YgUXRXZWJLaXQgZmFpbHMgYmVjYXVzZSBvZiBlcnJvcnMK KwlpbiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNE T3BlbkdMRVMuaC4KKwlNb2RpZmllZCB0aGUgaGVhZGVyIHRvIGluY2x1ZGUgcW9wZW5nbC5oIG9u bHkgZm9yIFF0NSwgYW5kIG90aGVyd2lzZQorICAgICAgICBmYWxsYmFjayB0byBHTEVTMi9nbDIu aCBhbmQgR0xFUzIvZ2wyZXh0LmggaW5jbHVkZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNE T3BlbkdMRVMuaDoKKwogMjAxMi0xMC0xMiAgSmFtZXMgU2ltb25zZW4gIDxzaW1vbmphbUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW1JlcXVlc3RBbmltYXRpb25GcmFtZV0gUmVtb3ZlIHZlbmRv ciBwcmVmaXgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29w ZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xFUy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTEVTLmgKaW5kZXggYTcwZWFhNy4uYmU1ZTUw MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4 dGVuc2lvbnMzRE9wZW5HTEVTLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTEVTLmgKQEAgLTI5LDcgKzI5LDcgQEAKIAogI2lu Y2x1ZGUgIkV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5oIgogCi0jaWYgUExBVEZPUk0oUVQpCisj aWYgUExBVEZPUk0oUVQpICYmIEhBVkUoUVQ1KQogLy8gVGFrZXMgY2FyZSBvZiBkZWNsYXJpbmcg dGhlIEdMRVMgZXh0ZW5zaW9ucy4KICNpbmNsdWRlIDxxb3BlbmdsLmg+CiAjZWxzZQotLSAKMS43 LjAuNAoK 172404 2012-11-05 14:15:02 -0800 2012-11-07 06:20:21 -0800 proposed patch 0001-Include-qopengl.h-only-when-building-against-Qt5.patch text/plain 2029 chombourger RnJvbSAzN2I3YTM4M2QxZTMyZWFhODk2Nzk5NDg1MTNjYTczYTJkNGE2NDdjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDZWRyaWMgSG9tYm91cmdlciA8Y2hvbWJvdXJnZXJAbXZpc3Rh LmNvbT4KRGF0ZTogTW9uLCA1IE5vdiAyMDEyIDIxOjQyOjQ0ICswMDAwClN1YmplY3Q6IFtQQVRD SF0gSW5jbHVkZSBxb3BlbmdsLmggb25seSB3aGVuIGJ1aWxkaW5nIGFnYWluc3QgUXQ1CgotLS0K IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAy MCArKysrKysrKysrKysrKysrKysrKwogLi4uL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RP cGVuR0xFUy5oICAgICAgICAgfCAgICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlv bnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMzMTE3MDQuLjhmNDdkYjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0xMS0wNSAgQ2VkcmljIEhvbWJvdXJnZXIg IDxjaG9tYm91cmdlckBtdmlzdGEuY29tPgorCisgICAgICAgIEluY2x1ZGUgcW9wZW5nbC5oIG9u bHkgd2hlbiBidWlsZGluZyBhZ2FpbnN0IFF0NQorCisgICAgICAgIFtRdF0gUXRXZWJLaXQtMi4z IHRyaWVzIHRvIG9wZW4gbm9uLWV4aXN0ZW50IHFvcGVuZ2wuaAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMjQ5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUXQ1IGFkZHMgcW9wZW5nbC5oIHRvIHRha2Ug Y2FyZSBvZiBhbGwgdGhlIE9wZW5HTCAjaW5jbHVkZXMKKyAgICAgICAgcmVxdWlyZWQgZm9yIHRo ZSB0YXJnZXQgcGxhdGZvcm0uIFVuZm9ydHVuYXRlbHkgdGhpcyBoZWFkZXIgZG9lcworICAgICAg ICBub3QgZXhpc3QgaW4gUXQgNC44IGFuZCBidWlsZGluZyBvZiBRdFdlYktpdCBmYWlscyBiZWNh dXNlIG9mIGVycm9ycworICAgICAgICBpbiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMRVMuaC4KKyAgICAgICAgTW9kaWZpZWQgdGhlIGhl YWRlciB0byBpbmNsdWRlIHFvcGVuZ2wuaCBvbmx5IGZvciBRdDUsIGFuZCBvdGhlcndpc2UKKyAg ICAgICAgZmFsbGJhY2sgdG8gR0xFUzIvZ2wyLmggYW5kIEdMRVMyL2dsMmV4dC5oIGluY2x1ZGVz LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTEVTLmg6CisKIDIwMTItMTAtMTIgIEph bWVzIFNpbW9uc2VuICA8c2ltb25qYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtSZXF1ZXN0 QW5pbWF0aW9uRnJhbWVdIFJlbW92ZSB2ZW5kb3IgcHJlZml4CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMRVMuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVu R0xFUy5oCmluZGV4IGE3MGVhYTcuLmJlNWU1MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xFUy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xF Uy5oCkBAIC0yOSw3ICsyOSw3IEBACiAKICNpbmNsdWRlICJFeHRlbnNpb25zM0RPcGVuR0xDb21t b24uaCIKIAotI2lmIFBMQVRGT1JNKFFUKQorI2lmIFBMQVRGT1JNKFFUKSAmJiBIQVZFKFFUNSkK IC8vIFRha2VzIGNhcmUgb2YgZGVjbGFyaW5nIHRoZSBHTEVTIGV4dGVuc2lvbnMuCiAjaW5jbHVk ZSA8cW9wZW5nbC5oPgogI2Vsc2UKLS0gCjEuNy4wLjQKCg==