74703 2011-12-16 03:18:50 -0800 [Qt][WK2] Fix the build for newer Qt5 2011-12-16 06:00:09 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P1 Blocker --- 1 ossy hausmann hausmann ossy oldest_to_newest 522664 0 ossy 2011-12-16 03:18:50 -0800 I updated Qt5 today morning to ba3ed7b92c87e318904a279a2fea7e9e6c00cfb8, but unfortunately I can't build WebKit trunk with it. Until I got a proper buildfix for WebKit trunk, I can't update Qt5 on the buildbot. I got the following error because of refactoring QTouchEvent: /home/oszi/WebKit/Tools/DumpRenderTree/qt/EventSenderQt.cpp: In member function 'void EventSender::sendTouchEvent(QEvent::Type)': /home/oszi/WebKit/Tools/DumpRenderTree/qt/EventSenderQt.cpp:483: error: no matching function for call to 'QTouchEvent::QTouchEvent(QEvent::Type&, QTouchEvent::DeviceType, Qt::KeyboardModifiers&)' /usr/local/Trolltech/Qt5/Qt-5.0.0-r16/include/QtGui/qevent.h:773: note: candidates are: QTouchEvent::QTouchEvent(QEvent::Type, QTouchDevice*, Qt::KeyboardModifiers, Qt::TouchPointStates, const QList<QTouchEvent::TouchPoint>&) /usr/local/Trolltech/Qt5/Qt-5.0.0-r16/include/QtGui/qevent.h:691: note: QTouchEvent::QTouchEvent(const QTouchEvent&) See http://lists.qt-project.org/pipermail/development/2011-December/000802.html and https://qt.gitorious.org/qt/qtbase/commit/4222603f8ea3a0d0ef5b9a190605ad86e00f27f6/diffs for details. Before this fail I had to apply a little fix because of a missing include: diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h index b5609c5..801146e 100644 --- a/Tools/QtTestBrowser/launcherwindow.h +++ b/Tools/QtTestBrowser/launcherwindow.h @@ -47,6 +47,10 @@ #include <QtUiTools/QUiLoader> #endif +#ifndef QT_NO_LINEEDIT +#include <QtWidgets/QLineEdit> +#endif + #include <QDebug> #include <cstdio> 522682 1 119599 hausmann 2011-12-16 04:19:17 -0800 Created attachment 119599 Patch 522720 2 119599 ossy 2011-12-16 05:59:46 -0800 Comment on attachment 119599 Patch Thanks for the quick fix, r=me. I'll land it when updating the Qt5 on the bot. 522722 3 119599 ossy 2011-12-16 06:00:02 -0800 Comment on attachment 119599 Patch Landed in http://trac.webkit.org/changeset/103060 119599 2011-12-16 04:19:17 -0800 2011-12-16 06:00:02 -0800 Patch bug-74703-20111216131915.patch text/plain 5349 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMDM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDI1MWYyZDNkM2JkMmMwNGM4OTk5NGM0ZDNhNWQyNTUy NzZjZjQxNS4uY2Y4YzQwMjFkNWRmNDhmNWE2Y2RkNzkyZmQ4YTJlOGE2ZDAxZDdiZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDExLTEyLTE2ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNv bT4KKworICAgICAgICBbUXRdIEZpeCB0aGUgYnVpbGQgZm9yIG5ld2VyIFF0NQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ3MDMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1 bmNoZXJ3aW5kb3cuaDogQWRkIG1pc3NpbmcgZm9yd2FyZCBkZWNsYXJhdGlvbi4KKyAgICAgICAg KiBEdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcDoKKyAgICAgICAgKEV2ZW50U2Vu ZGVyOjpzZW5kVG91Y2hFdmVudCk6IEFsbG9jYXRlIFFUb3VjaERldmljZSBhbmQgdXNlIHdpdGgg UVRvdWNoRXZlbnQgY29uc3RydWN0b3IuCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9xdC9F dmVudFNlbmRlclByb3h5UXQuY3BwOiBEaXR0by4KKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQ cm94eTo6c2VuZFRvdWNoRXZlbnQpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93 c2VyQXBwbGljYXRpb24uY3BwOgorICAgICAgICAoTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6c2Vu ZFRvdWNoRXZlbnQpOiBEaXR0by4KKyAgICAgICAgKE1pbmlCcm93c2VyQXBwbGljYXRpb246Om5v dGlmeSk6IEFkYXB0IHRvIGNoYW5nZWQgQVBJIGZvciBtYXJraW5nIHByaW1hcnkgdG91Y2ggcG9p bnQuCisKIDIwMTEtMTItMTUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAg ICAgIE5SV1Qgc2hvdWxkIHVzZSBmcmVlICsgaW5hY3RpdmUgbWVtb3J5IGZvciBkZWZhdWx0X2No aWxkX3Byb2Nlc3NlcyBvbiBPUyBYIChhbmQgbmV2ZXIgcmV0dXJuIDwgMSBwcm9jZXNzKQpkaWZm IC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRXZlbnRTZW5kZXJRdC5jcHAgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcAppbmRleCAxZWNiNzM5N2JkZjg3 MjQ4ZTMxYWJkNjRlZDliYWY1MzVmZDk5MTg1Li4zZTQ1OTBlN2YxNDhlNTQ2NDEwYWM0MDM1ZDE3 MTdkNGFjYzkxZmEwIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNl bmRlclF0LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNw cApAQCAtNDgwLDcgKzQ4MCwxOCBAQCB2b2lkIEV2ZW50U2VuZGVyOjpyZWxlYXNlVG91Y2hQb2lu dChpbnQgaW5kZXgpCiAKIHZvaWQgRXZlbnRTZW5kZXI6OnNlbmRUb3VjaEV2ZW50KFFFdmVudDo6 VHlwZSB0eXBlKQogeworI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg1LCAwLCAw KQorICAgIHN0YXRpYyBRVG91Y2hEZXZpY2UqIGRldmljZSA9IDA7CisgICAgaWYgKCFkZXZpY2Up IHsKKyAgICAgICAgZGV2aWNlID0gbmV3IFFUb3VjaERldmljZTsKKyAgICAgICAgZGV2aWNlLT5z ZXRUeXBlKFFUb3VjaERldmljZTo6VG91Y2hTY3JlZW4pOworICAgICAgICBRV2luZG93U3lzdGVt SW50ZXJmYWNlOjpyZWdpc3RlclRvdWNoRGV2aWNlKGRldmljZSk7CisgICAgfQorCisgICAgUVRv dWNoRXZlbnQgZXZlbnQodHlwZSwgZGV2aWNlLCBtX3RvdWNoTW9kaWZpZXJzKTsKKyNlbHNlCiAg ICAgUVRvdWNoRXZlbnQgZXZlbnQodHlwZSwgUVRvdWNoRXZlbnQ6OlRvdWNoU2NyZWVuLCBtX3Rv dWNoTW9kaWZpZXJzKTsKKyNlbmRpZgogICAgIGV2ZW50LnNldFRvdWNoUG9pbnRzKG1fdG91Y2hQ b2ludHMpOwogICAgIHNlbmRFdmVudChtX3BhZ2UsICZldmVudCk7CiAgICAgUUxpc3Q8UVRvdWNo RXZlbnQ6OlRvdWNoUG9pbnQ+OjpJdGVyYXRvciBpdCA9IG1fdG91Y2hQb2ludHMuYmVnaW4oKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyQXBwbGljYXRpb24u Y3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKaW5k ZXggMDk5YTY0MWQ2OTVlYTM0YmUxZDQxNGRmYTdiY2ZiOGExYjdkYTQ3Zi4uMGVhM2MzYjc4M2E3 NDdlMzQwZTYyNDA4ZTAyM2Q2MjY3OGI2MzFjZSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dz ZXIvcXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIv cXQvTWluaUJyb3dzZXJBcHBsaWNhdGlvbi5jcHAKQEAgLTExMSw3ICsxMTEsNiBAQCBib29sIE1p bmlCcm93c2VyQXBwbGljYXRpb246Om5vdGlmeShRT2JqZWN0KiB0YXJnZXQsIFFFdmVudCogZXZl bnQpCiAgICAgICAgIFFXaW5kb3dTeXN0ZW1JbnRlcmZhY2U6OlRvdWNoUG9pbnQgdG91Y2hQb2lu dDsKICAgICAgICAgdG91Y2hQb2ludC5hcmVhID0gUVJlY3RGKG1vdXNlRXZlbnQtPmdsb2JhbFBv cygpLCBRU2l6ZUYoMSwgMSkpOwogICAgICAgICB0b3VjaFBvaW50LnByZXNzdXJlID0gMTsKLSAg ICAgICAgdG91Y2hQb2ludC5pc1ByaW1hcnkgPSBmYWxzZTsKIAogICAgICAgICBzd2l0Y2ggKG1v dXNlRXZlbnQtPnR5cGUoKSkgewogICAgICAgICBjYXNlIFFFdmVudDo6TW91c2VCdXR0b25QcmVz czoKQEAgLTE0Miw3ICsxNDEsNyBAQCBib29sIE1pbmlCcm93c2VyQXBwbGljYXRpb246Om5vdGlm eShRT2JqZWN0KiB0YXJnZXQsIFFFdmVudCogZXZlbnQpCiAKICAgICAgICAgLy8gVXBkYXRlIGN1 cnJlbnQgdG91Y2gtcG9pbnQKICAgICAgICAgaWYgKG1fdG91Y2hQb2ludHMuaXNFbXB0eSgpKQot ICAgICAgICAgICAgdG91Y2hQb2ludC5pc1ByaW1hcnkgPSB0cnVlOworICAgICAgICAgICAgdG91 Y2hQb2ludC5mbGFncyB8PSBRVG91Y2hFdmVudDo6VG91Y2hQb2ludDo6UHJpbWFyeTsKICAgICAg ICAgbV90b3VjaFBvaW50cy5pbnNlcnQodG91Y2hQb2ludC5pZCwgdG91Y2hQb2ludCk7CiAKICAg ICAgICAgLy8gVXBkYXRlIHN0YXRlcyBmb3IgYWxsIG90aGVyIHRvdWNoLXBvaW50cwpAQCAtMTU5 LDggKzE1OCwxNSBAQCBib29sIE1pbmlCcm93c2VyQXBwbGljYXRpb246Om5vdGlmeShRT2JqZWN0 KiB0YXJnZXQsIFFFdmVudCogZXZlbnQpCiAKIHZvaWQgTWluaUJyb3dzZXJBcHBsaWNhdGlvbjo6 c2VuZFRvdWNoRXZlbnQoQnJvd3NlcldpbmRvdyogYnJvd3NlcldpbmRvdykKIHsKKyAgICBzdGF0 aWMgUVRvdWNoRGV2aWNlKiBkZXZpY2UgPSAwOworICAgIGlmICghZGV2aWNlKSB7CisgICAgICAg IGRldmljZSA9IG5ldyBRVG91Y2hEZXZpY2U7CisgICAgICAgIGRldmljZS0+c2V0VHlwZShRVG91 Y2hEZXZpY2U6OlRvdWNoU2NyZWVuKTsKKyAgICAgICAgUVdpbmRvd1N5c3RlbUludGVyZmFjZTo6 cmVnaXN0ZXJUb3VjaERldmljZShkZXZpY2UpOworICAgIH0KKwogICAgIG1fcGVuZGluZ0Zha2VU b3VjaEV2ZW50Q291bnQrKzsKLSAgICBRV2luZG93U3lzdGVtSW50ZXJmYWNlOjpoYW5kbGVUb3Vj aEV2ZW50KGJyb3dzZXJXaW5kb3csIFFFdmVudDo6Tm9uZSwgUVRvdWNoRXZlbnQ6OlRvdWNoU2Ny ZWVuLCBtX3RvdWNoUG9pbnRzLnZhbHVlcygpKTsKKyAgICBRV2luZG93U3lzdGVtSW50ZXJmYWNl OjpoYW5kbGVUb3VjaEV2ZW50KGJyb3dzZXJXaW5kb3csIFFFdmVudDo6Tm9uZSwgZGV2aWNlLCBt X3RvdWNoUG9pbnRzLnZhbHVlcygpKTsKIAogICAgIGlmICghbV93aW5kb3dPcHRpb25zLnVzZVRy YWRpdGlvbmFsRGVza3RvcEJlaGF2aW9yKCkpCiAgICAgICAgIGJyb3dzZXJXaW5kb3ctPnVwZGF0 ZVZpc3VhbE1vY2tUb3VjaFBvaW50cyhtX3RvdWNoUG9pbnRzLnZhbHVlcygpKTsKZGlmZiAtLWdp dCBhL1Rvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaCBiL1Rvb2xzL1F0VGVzdEJy b3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAppbmRleCBiNTYwOWM1ZWIxODQyZTllZDk3MzU5MjNiMTli NGI1YzY5ZGNlMGIwLi45NDQ1MjYwNWEwOWQwNTQ2OThlY2M3NDQ3MGI4NmE1NWNkOTBmN2UxIDEw MDY0NAotLS0gYS9Ub29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKKysrIGIvVG9v bHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCkBAIC02NCw2ICs2NCw3IEBACiAjaW5j bHVkZSAid2Vidmlldy5oIgogCiBjbGFzcyBRUHJvcGVydHlBbmltYXRpb247CitjbGFzcyBRTGlu ZUVkaXQ7CiAKIGNsYXNzIFdpbmRvd09wdGlvbnMgewogcHVibGljOgpkaWZmIC0tZ2l0IGEvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5UXQuY3BwIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9xdC9FdmVudFNlbmRlclByb3h5UXQuY3BwCmluZGV4IDNkMzg5ODBlYWIx NDZmMGYxMWY0MmI5ZWQ5MGQyYTE2OTcyNjRmZjkuLjE0MjA5ODdmYmExZGNlM2Q4YzIyODJhOGUz MWJhZDBlY2E5MjEyZmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvcXQvRXZl bnRTZW5kZXJQcm94eVF0LmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L0V2ZW50 U2VuZGVyUHJveHlRdC5jcHAKQEAgLTM4Miw3ICszODIsMTQgQEAgdm9pZCBFdmVudFNlbmRlclBy b3h5OjpyZWxlYXNlVG91Y2hQb2ludChpbnQgaW5kZXgpCiAKIHZvaWQgRXZlbnRTZW5kZXJQcm94 eTo6c2VuZFRvdWNoRXZlbnQoUUV2ZW50OjpUeXBlIHR5cGUpCiB7Ci0gICAgUVRvdWNoRXZlbnQg ZXZlbnQodHlwZSwgUVRvdWNoRXZlbnQ6OlRvdWNoU2NyZWVuLCBtX3RvdWNoTW9kaWZpZXJzKTsK KyAgICBzdGF0aWMgUVRvdWNoRGV2aWNlKiBkZXZpY2UgPSAwOworICAgIGlmICghZGV2aWNlKSB7 CisgICAgICAgIGRldmljZSA9IG5ldyBRVG91Y2hEZXZpY2U7CisgICAgICAgIGRldmljZS0+c2V0 VHlwZShRVG91Y2hEZXZpY2U6OlRvdWNoU2NyZWVuKTsKKyAgICAgICAgUVdpbmRvd1N5c3RlbUlu dGVyZmFjZTo6cmVnaXN0ZXJUb3VjaERldmljZShkZXZpY2UpOworICAgIH0KKworICAgIFFUb3Vj aEV2ZW50IGV2ZW50KHR5cGUsIGRldmljZSwgbV90b3VjaE1vZGlmaWVycyk7CiAgICAgZXZlbnQu c2V0VG91Y2hQb2ludHMobV90b3VjaFBvaW50cyk7CiAgICAgbV90ZXN0Q29udHJvbGxlci0+bWFp bldlYlZpZXcoKS0+c2VuZEV2ZW50KCZldmVudCk7CiAgICAgUUxpc3Q8UVRvdWNoRXZlbnQ6OlRv dWNoUG9pbnQ+OjpJdGVyYXRvciBpdCA9IG1fdG91Y2hQb2ludHMuYmVnaW4oKTsK