52460 2011-01-14 10:59:11 -0800 [Qt] Fixed compilation when QT_NO_SHORTCUT is defined 2011-01-14 12:44:09 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P5 Enhancement --- 1 annulen webkit-unassigned benjamin commit-queue kenneth laszlo.gombos oldest_to_newest 334422 0 annulen 2011-01-14 10:59:11 -0800 This patch fixes compilation when QT_NO_SHORTCUT is defined in Qt configuration 334430 1 78964 annulen 2011-01-14 11:06:48 -0800 Created attachment 78964 Fixed compilation when QT_NO_SHORTCUT is defined 334437 2 benjamin 2011-01-14 11:09:50 -0800 Please follow this to report bugs on QtWebKit: http://trac.webkit.org/wiki/QtWebKitBugs By using the template, you get the "Qt" keyword and the bug appear in our lists. 334439 3 78964 benjamin 2011-01-14 11:16:34 -0800 Comment on attachment 78964 Fixed compilation when QT_NO_SHORTCUT is defined View in context: https://bugs.webkit.org/attachment.cgi?id=78964&action=review > WebKit/qt/ChangeLog:8 > + This patch fixes compilation when QT_NO_SHORTCUT is defined in Qt configuration <Kenneth>A dot at the end of the sentence!</Kenneth> > WebKit/qt/WebCoreSupport/EditorClientQt.cpp:484 > +#ifndef QT_NO_SHORTCUT > } > - > +#endif I would rather see } else #endif // QT_NO_SHORTCUT { a dozen of lines above. 334442 4 benjamin 2011-01-14 11:17:17 -0800 Adding Laszlo, he works on minimal builds. 334445 5 78967 annulen 2011-01-14 11:24:48 -0800 Created attachment 78967 Fixed compilation when QT_NO_SHORTCUT is defined 334471 6 kenneth 2011-01-14 11:52:19 -0800 > <Kenneth>A dot at the end of the sentence!</Kenneth> hahaah :-) So much for enforcing the WebKit coding style! Actually it is not a real sentence without the punctuation mark at the end. :-) 334475 7 78967 laszlo.gombos 2011-01-14 11:54:17 -0800 Comment on attachment 78967 Fixed compilation when QT_NO_SHORTCUT is defined LGTM, r+. Thanks. 334526 8 78967 commit-queue 2011-01-14 12:44:02 -0800 Comment on attachment 78967 Fixed compilation when QT_NO_SHORTCUT is defined Clearing flags on attachment: 78967 Committed r75812: <http://trac.webkit.org/changeset/75812> 334527 9 commit-queue 2011-01-14 12:44:09 -0800 All reviewed patches have been landed. Closing bug. 78964 2011-01-14 11:06:48 -0800 2011-01-14 11:24:48 -0800 Fixed compilation when QT_NO_SHORTCUT is defined 0001-Qt-Fixed-compilation-when-QT_NO_SHORTCUT-is-defined.patch text/plain 2101 annulen RnJvbSAxODNkY2M3OGExOGNkMWVjOWYwMWQzM2VhMjliZGM5NmU5MDE2MWM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLb25zdGFudGluIFRva2FyZXYgPGFubnVsZW5AeWFuZGV4LnJ1 PgpEYXRlOiBGcmksIDE0IEphbiAyMDExIDIyOjAyOjU5ICswMzAwClN1YmplY3Q6IFtQQVRDSF0g W1F0XSBGaXhlZCBjb21waWxhdGlvbiB3aGVuIFFUX05PX1NIT1JUQ1VUIGlzIGRlZmluZWQKCi0t LQogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTIgKysr KysrKysrKysrCiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwIHwg ICAgNSArKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdl TG9nCmluZGV4IGJmMjBlYWYuLjk2N2M5ZjUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTAxLTE0 ICBLb25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEZpeGVkIGNvbXBpbGF0aW9u IHdoZW4gUVRfTk9fU0hPUlRDVVQgaXMgZGVmaW5lZAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTI0NjAKKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVz IGNvbXBpbGF0aW9uIHdoZW4gUVRfTk9fU0hPUlRDVVQgaXMgZGVmaW5lZCBpbiBRdCBjb25maWd1 cmF0aW9uCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnRRdDo6aGFuZGxlS2V5Ym9hcmRFdmVudCk6IEFk ZGVkIFFUX05PX1NIT1JUQ1VUIGd1YXJkcworCiAyMDExLTAxLTEzICBZaSBTaGVuICA8eWkuNC5z aGVuQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAgYi9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQuY3BwCmluZGV4IDUzNGUzMzQu LjI5MTg5NjIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGll bnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNw cApAQCAtNDc5LDggKzQ3OSw5IEBAIHZvaWQgRWRpdG9yQ2xpZW50UXQ6OmhhbmRsZUtleWJvYXJk RXZlbnQoS2V5Ym9hcmRFdmVudCogZXZlbnQpCiAgICAgICAgICAgICAgICAgZXZlbnQtPnNldERl ZmF1bHRIYW5kbGVkKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQor I2lmbmRlZiBRVF9OT19TSE9SVENVVAogICAgICAgICB9Ci0KKyNlbmRpZgogICAgICAgICAvLyBF dmVudCBub3QgaGFuZGxlZC4KICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTQ5NSwxMCArNDk2 LDEyIEBAIHZvaWQgRWRpdG9yQ2xpZW50UXQ6OmhhbmRsZUtleWJvYXJkRXZlbnQoS2V5Ym9hcmRF dmVudCogZXZlbnQpCiAgICAgICAgIGNhc2UgVktfSE9NRToKICAgICAgICAgY2FzZSBWS19FTkQ6 CiAgICAgICAgICAgICB7CisjaWZuZGVmIFFUX05PX1NIT1JUQ1VUCiAgICAgICAgICAgICAgICAg UVdlYlBhZ2U6OldlYkFjdGlvbiBhY3Rpb24gPSBRV2ViUGFnZVByaXZhdGU6OmVkaXRvckFjdGlv bkZvcktleUV2ZW50KGtldmVudC0+cXRFdmVudCgpKTsKICAgICAgICAgICAgICAgICBBU1NFUlQo YWN0aW9uICE9IFFXZWJQYWdlOjpOb1dlYkFjdGlvbik7CiAgICAgICAgICAgICAgICAgbV9wYWdl LT50cmlnZ2VyQWN0aW9uKGFjdGlvbik7CiAgICAgICAgICAgICAgICAgZXZlbnQtPnNldERlZmF1 bHRIYW5kbGVkKCk7CisjZW5kaWYKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICB9CiAgICAgICAgIGNhc2UgVktfUFJJT1I6IC8vIFBhZ2VVcAotLSAKMS43LjMKCg== 78967 2011-01-14 11:24:48 -0800 2011-01-14 12:44:02 -0800 Fixed compilation when QT_NO_SHORTCUT is defined 0001-Qt-Fixed-compilation-when-QT_NO_SHORTCUT-is-defined.patch text/plain 2307 annulen RnJvbSA0NzMyY2QzNjc2ZGMxYmVmY2ViNzYxNzAyMDQwYmUxYjJmYmUwZmZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLb25zdGFudGluIFRva2FyZXYgPGFubnVsZW5AeWFuZGV4LnJ1 PgpEYXRlOiBGcmksIDE0IEphbiAyMDExIDIyOjIzOjQ2ICswMzAwClN1YmplY3Q6IFtQQVRDSF0g W1F0XSBGaXhlZCBjb21waWxhdGlvbiB3aGVuIFFUX05PX1NIT1JUQ1VUIGlzIGRlZmluZWQKCi0t LQogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysr KysrKysrKysrKwogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcCB8 ICAgIDUgKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5n ZUxvZwppbmRleCBiZjIwZWFmLi5jYTFlZWNkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdl TG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wMS0x NCAgS29uc3RhbnRpbiBUb2thcmV2ICA8YW5udWxlbkB5YW5kZXgucnU+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBGaXhlZCBjb21waWxhdGlv biB3aGVuIFFUX05PX1NIT1JUQ1VUIGlzIGRlZmluZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNDYwCisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhl cyBjb21waWxhdGlvbiB3aGVuIFFUX05PX1NIT1JUQ1VUIGlzIGRlZmluZWQgaW4gUXQKKyAgICAg ICAgY29uZmlndXJhdGlvbi4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvckNsaWVudFF0OjpoYW5kbGVLZXlib2Fy ZEV2ZW50KTogQWRkZWQgUVRfTk9fU0hPUlRDVVQgZ3VhcmRzCisKIDIwMTEtMDEtMTMgIFlpIFNo ZW4gIDx5aS40LnNoZW5Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhh dXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAKaW5k ZXggNTM0ZTMzNC4uZWQ2YmM0NSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0VkaXRvckNsaWVudFF0LmNwcAorKysgYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9y Q2xpZW50UXQuY3BwCkBAIC00NDMsOCArNDQzLDkgQEAgdm9pZCBFZGl0b3JDbGllbnRRdDo6aGFu ZGxlS2V5Ym9hcmRFdmVudChLZXlib2FyZEV2ZW50KiBldmVudCkKICAgICAgICAgICAgIG1fcGFn ZS0+dHJpZ2dlckFjdGlvbihhY3Rpb24pOwogICAgICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRI YW5kbGVkKCk7CiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAg IH0gZWxzZSAKICNlbmRpZiAvLyBRVF9OT19TSE9SVENVVAorICAgICAgICB7CiAgICAgICAgICAg ICBTdHJpbmcgY29tbWFuZE5hbWUgPSBlZGl0b3JDb21tYW5kRm9yS2V5RG93bkV2ZW50KGV2ZW50 KTsKICAgICAgICAgICAgIGlmICghY29tbWFuZE5hbWUuaXNFbXB0eSgpKSB7CiAgICAgICAgICAg ICAgICAgaWYgKGZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZChjb21tYW5kTmFtZSkuZXhlY3V0ZSgp KSAvLyBFdmVudCBoYW5kbGVkLgpAQCAtNDk1LDEwICs0OTYsMTIgQEAgdm9pZCBFZGl0b3JDbGll bnRRdDo6aGFuZGxlS2V5Ym9hcmRFdmVudChLZXlib2FyZEV2ZW50KiBldmVudCkKICAgICAgICAg Y2FzZSBWS19IT01FOgogICAgICAgICBjYXNlIFZLX0VORDoKICAgICAgICAgICAgIHsKKyNpZm5k ZWYgUVRfTk9fU0hPUlRDVVQKICAgICAgICAgICAgICAgICBRV2ViUGFnZTo6V2ViQWN0aW9uIGFj dGlvbiA9IFFXZWJQYWdlUHJpdmF0ZTo6ZWRpdG9yQWN0aW9uRm9yS2V5RXZlbnQoa2V2ZW50LT5x dEV2ZW50KCkpOwogICAgICAgICAgICAgICAgIEFTU0VSVChhY3Rpb24gIT0gUVdlYlBhZ2U6Ok5v V2ViQWN0aW9uKTsKICAgICAgICAgICAgICAgICBtX3BhZ2UtPnRyaWdnZXJBY3Rpb24oYWN0aW9u KTsKICAgICAgICAgICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyNlbmRpZgog ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgY2FzZSBWS19Q UklPUjogLy8gUGFnZVVwCi0tIAoxLjcuMwoK