37428 2010-04-11 18:46:49 -0700 [Qt] Patch to fix compilation warnings for QGraphicsWebView 2010-05-06 06:12:20 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED Qt, QtTriaged P2 Trivial --- 0 menard webkit-unassigned commit-queue hausmann oldest_to_newest 211482 0 53124 menard 2010-04-11 18:46:49 -0700 Created attachment 53124 Patch to fix warnings. Fix compilation warnings in QGraphicsWebView. Trivial, should be quick to review the attached patch. 212511 1 53355 kling 2010-04-14 13:01:20 -0700 Created attachment 53355 Diff against trunk with ChangeLog Thanks for the patch Alexis! I've updated it to the proper format. Please have a look at http://trac.webkit.org/wiki/QtWebKitContrib for future contributions :-) 213517 2 53355 hausmann 2010-04-16 17:20:56 -0700 Comment on attachment 53355 Diff against trunk with ChangeLog > diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp > index 919a10a..b3bcbe7 100644 > --- a/WebKit/qt/Api/qgraphicswebview.cpp > +++ b/WebKit/qt/Api/qgraphicswebview.cpp > @@ -647,9 +647,13 @@ QVariant QGraphicsWebView::itemChange(GraphicsItemChange change, const QVariant& > case ItemCursorChange: > return value; > case ItemCursorHasChanged: > - QEvent event(QEvent::CursorChange); > - QApplication::sendEvent(this, &event); > - return value; > + { > + QEvent event(QEvent::CursorChange); > + QApplication::sendEvent(this, &event); > + return value; > + } Coding style wants the opening brace on the line preceeding the code block. Only function definitions have braces on lines of their own. Otherwise LGTM of course. 221610 3 55225 jturcotte 2010-05-06 04:37:41 -0700 Created attachment 55225 Fixed style issue 221635 4 55225 commit-queue 2010-05-06 06:12:14 -0700 Comment on attachment 55225 Fixed style issue Clearing flags on attachment: 55225 Committed r58877: <http://trac.webkit.org/changeset/58877> 221636 5 commit-queue 2010-05-06 06:12:20 -0700 All reviewed patches have been landed. Closing bug. 53124 2010-04-11 18:46:49 -0700 2010-04-14 13:01:20 -0700 Patch to fix warnings. qgraphicswebview.diff text/plain 854 menard ZGlmZiAtLWdpdCBhL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3 ZWJ2aWV3LmNwcCBiL3NyYy8zcmRwYXJ0eS93ZWJraXQvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3 ZWJ2aWV3LmNwcAppbmRleCA0OTBhZGExLi41NjhhMzk1IDEwMDY0NAotLS0gYS9zcmMvM3JkcGFy dHkvd2Via2l0L1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvc3JjLzNy ZHBhcnR5L3dlYmtpdC9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCkBAIC0zNDAs MTIgKzM0MCwxNSBAQCBRVmFyaWFudCBRR3JhcGhpY3NXZWJWaWV3OjppdGVtQ2hhbmdlKEdyYXBo aWNzSXRlbUNoYW5nZSBjaGFuZ2UsIGNvbnN0IFFWYXJpYW50JgogICAgIC8vIEFmdGVyIGN1cnNv ciBpcyBwcm9wZXJseSBzZXQgKGF0ICdJdGVtQ3Vyc29ySGFzQ2hhbmdlZCcgZW1pc3Npb24gdGlt ZSksIHdlCiAgICAgLy8gZmlyZSAnQ3Vyc29yQ2hhbmdlJy4KICAgICBjYXNlIEl0ZW1DdXJzb3JD aGFuZ2U6Ci0gICAgICAgIHJldHVybiB2YWx1ZTsKLSAgICBjYXNlIEl0ZW1DdXJzb3JIYXNDaGFu Z2VkOgorICAgICAgICAgcmV0dXJuIHZhbHVlOworICAgIGNhc2UgSXRlbUN1cnNvckhhc0NoYW5n ZWQ6IHsKICAgICAgICAgUUV2ZW50IGV2ZW50KFFFdmVudDo6Q3Vyc29yQ2hhbmdlKTsKICAgICAg ICAgUUFwcGxpY2F0aW9uOjpzZW5kRXZlbnQodGhpcywgJmV2ZW50KTsKICAgICAgICAgcmV0dXJu IHZhbHVlOwogICAgIH0KKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9CiAKICAg ICByZXR1cm4gUUdyYXBoaWNzV2lkZ2V0OjppdGVtQ2hhbmdlKGNoYW5nZSwgdmFsdWUpOwogfQo= 53355 2010-04-14 13:01:20 -0700 2010-05-06 04:37:41 -0700 Diff against trunk with ChangeLog bug-37428.diff text/plain 1402 kling ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDkxOWExMGEuLmIzYmNiZTcgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtNjQ3LDkgKzY0NywxMyBAQCBRVmFyaWFudCBR R3JhcGhpY3NXZWJWaWV3OjppdGVtQ2hhbmdlKEdyYXBoaWNzSXRlbUNoYW5nZSBjaGFuZ2UsIGNv bnN0IFFWYXJpYW50JgogICAgIGNhc2UgSXRlbUN1cnNvckNoYW5nZToKICAgICAgICAgcmV0dXJu IHZhbHVlOwogICAgIGNhc2UgSXRlbUN1cnNvckhhc0NoYW5nZWQ6Ci0gICAgICAgIFFFdmVudCBl dmVudChRRXZlbnQ6OkN1cnNvckNoYW5nZSk7Ci0gICAgICAgIFFBcHBsaWNhdGlvbjo6c2VuZEV2 ZW50KHRoaXMsICZldmVudCk7Ci0gICAgICAgIHJldHVybiB2YWx1ZTsKKyAgICAgICAgeworICAg ICAgICAgICAgUUV2ZW50IGV2ZW50KFFFdmVudDo6Q3Vyc29yQ2hhbmdlKTsKKyAgICAgICAgICAg IFFBcHBsaWNhdGlvbjo6c2VuZEV2ZW50KHRoaXMsICZldmVudCk7CisgICAgICAgICAgICByZXR1 cm4gdmFsdWU7CisgICAgICAgIH0KKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKICAgICB9 CiAKICAgICByZXR1cm4gUUdyYXBoaWNzV2lkZ2V0OjppdGVtQ2hhbmdlKGNoYW5nZSwgdmFsdWUp OwpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cK aW5kZXggZmU2NDRlZi4uMzNkZTYwMCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZwor KysgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDQtMTQgIEFu ZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFBhdGNoIHRvIGZpeCBjb21waWxh dGlvbiB3YXJuaW5ncyBmb3IgUUdyYXBoaWNzV2ViVmlldworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzc0MjgKKworICAgICAgICBQYXRjaCBieSBBbGV4 aXMgTWVuYXJkIDxhbGV4aXMubWVuYXJkQG5va2lhLmNvbT4KKworICAgICAgICAqIEFwaS9xZ3Jh cGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFHcmFwaGljc1dlYlZpZXc6Oml0ZW1DaGFuZ2Up OgorCiAyMDEwLTA0LTEzICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW5hbWUgU2VjdXJpdHlPcmlnaW46OndoaXRlTGlzdEFjY2Vzc0Zyb21PcmlnaW4g dG8gYWRkT3JpZ2luQWNjZXNzV2hpdGVsaXN0RW50cnkuCg== 55225 2010-05-06 04:37:41 -0700 2010-05-06 06:12:14 -0700 Fixed style issue alexis_warningfixes.patch text/plain 1418 jturcotte ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDBjMTNlNDMuLjgyMWU2OTkgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtNjUwLDEwICs2NTAsMTMgQEAgUVZhcmlhbnQg UUdyYXBoaWNzV2ViVmlldzo6aXRlbUNoYW5nZShHcmFwaGljc0l0ZW1DaGFuZ2UgY2hhbmdlLCBj b25zdCBRVmFyaWFudCYKICAgICAvLyBmaXJlICdDdXJzb3JDaGFuZ2UnLgogICAgIGNhc2UgSXRl bUN1cnNvckNoYW5nZToKICAgICAgICAgcmV0dXJuIHZhbHVlOwotICAgIGNhc2UgSXRlbUN1cnNv ckhhc0NoYW5nZWQ6Ci0gICAgICAgIFFFdmVudCBldmVudChRRXZlbnQ6OkN1cnNvckNoYW5nZSk7 Ci0gICAgICAgIFFBcHBsaWNhdGlvbjo6c2VuZEV2ZW50KHRoaXMsICZldmVudCk7Ci0gICAgICAg IHJldHVybiB2YWx1ZTsKKyAgICBjYXNlIEl0ZW1DdXJzb3JIYXNDaGFuZ2VkOiB7CisgICAgICAg ICAgICBRRXZlbnQgZXZlbnQoUUV2ZW50OjpDdXJzb3JDaGFuZ2UpOworICAgICAgICAgICAgUUFw cGxpY2F0aW9uOjpzZW5kRXZlbnQodGhpcywgJmV2ZW50KTsKKyAgICAgICAgICAgIHJldHVybiB2 YWx1ZTsKKyAgICAgICAgfQorICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOwogICAgIH0KIAog ICAgIHJldHVybiBRR3JhcGhpY3NXaWRnZXQ6Oml0ZW1DaGFuZ2UoY2hhbmdlLCB2YWx1ZSk7CmRp ZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRl eCA1ZWFkY2YyLi5kODc4MjExIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBi L1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNC0xNCAgQW5kcmVh cyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUGF0Y2ggdG8gZml4IGNvbXBpbGF0aW9u IHdhcm5pbmdzIGZvciBRR3JhcGhpY3NXZWJWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzQyOAorCisgICAgICAgIFBhdGNoIGJ5IEFsZXhpcyBN ZW5hcmQgPGFsZXhpcy5tZW5hcmRAbm9raWEuY29tPgorCisgICAgICAgICogQXBpL3FncmFwaGlj c3dlYnZpZXcuY3BwOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6aXRlbUNoYW5nZSk6CisK IDIwMTAtMDUtMDQgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgo=