40313 2010-06-08 11:36:28 -0700 [Qt] Fix #ifdef statements in QtTestBrowser's main.cpp file... 2010-06-15 07:14:09 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux CLOSED FIXED Qt P5 Normal --- 35784 0 adawit webkit-unassigned hausmann kent.hansen oldest_to_newest 235398 0 adawit 2010-06-08 11:36:28 -0700 No idea if using "#ifdef Q_WS_MAEMO_5 && defined(Q_WS_S60" is intentional in WebKitTools/QtTestBrowser/main.cpp, but gcc throws up the following warning: qtwebkit/WebKitTools/QtTestBrowser/main.cpp:88:21: warning: extra tokens at end of #ifdef directive qtwebkit/WebKitTools/QtTestBrowser/main.cpp:675:21: warning: extra tokens at end of #ifdef directive qtwebkit/WebKitTools/QtTestBrowser/main.cpp:776:21: warning: extra tokens at end of #ifdef directive 235401 1 58164 adawit 2010-06-08 11:41:12 -0700 Created attachment 58164 Patch Trivial fix for the #ifdef statements... 235434 2 58164 laszlo.gombos 2010-06-08 12:34:28 -0700 Comment on attachment 58164 Patch This has been fixed some time back - http://trac.webkit.org/changeset/56575; that is why the patch does not seems to apply against the trunk any more. 235495 3 adawit 2010-06-08 13:44:51 -0700 (In reply to comment #2) > (From update of attachment 58164 [details]) > This has been fixed some time back - http://trac.webkit.org/changeset/56575; that is why the patch does not seems to apply against the trunk any more. Can the fix then be cherry picked back into the qtwebkit-2.0 branch or is it too late for that ? It definitely is not fixed the qtwebkit 2.0 branch as I updated my copy to check before submitting the patch. 238319 4 kent.hansen 2010-06-15 04:23:44 -0700 Committed r56575: <http://trac.webkit.org/changeset/56575> 238370 5 hausmann 2010-06-15 07:13:59 -0700 Revision r56575 cherry-picked into qtwebkit-2.0 with commit a114f863da6c67ed95cd31630b9bfd758b87d293 58164 2010-06-08 11:41:12 -0700 2010-06-11 15:19:16 -0700 Patch qtwebkit_fix_ifdef_statements_in_qttestbrowser.patch text/plain 1691 adawit ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmNjEyMjc4Li5kYWRlM2IxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDYt MDggIERhd2l0IEFsZW1heWVodSAgPGFkYXdpdEBrZGUub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCAjaWZkZWYgc3RhdGVtZW50cyBpbiBR dFRlc3RCcm93c2VyL21haW4uY3BwCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQwMzEzCisKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL21haW4uY3Bw OgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OnNob3dGUFMpOgorICAgICAgICAoTGF1bmNoZXJX aW5kb3c6OnVwZGF0ZUZQUyk6CisKIDIwMTAtMDYtMDIgIFRhc3VrdSBTdXp1a2kgIDx0YXN1a3Uu c3V6dWtpQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaGluaWNoaXJvIEhhbWFq aS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAgYi9XZWJL aXRUb29scy9RdFRlc3RCcm93c2VyL21haW4uY3BwCmluZGV4IDMwY2I0ZjAuLjIxYzY2ZTUgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAKKysrIGIvV2ViS2l0 VG9vbHMvUXRUZXN0QnJvd3Nlci9tYWluLmNwcApAQCAtODUsNyArODUsNyBAQCBzdGF0aWMgUVVy bCBnSW5zcGVjdG9yVXJsOwogc3RhdGljIGJvb2wgZ1Jlc2l6ZXNUb0NvbnRlbnRzID0gZmFsc2U7 CiBzdGF0aWMgYm9vbCBnVXNlVGlsZWRCYWNraW5nU3RvcmUgPSBmYWxzZTsKIAotI2lmZGVmIFFf V1NfTUFFTU9fNSB8fCBkZWZpbmVkKFFfV1NfUzYwKQorI2lmIGRlZmluZWQoUV9XU19NQUVNT181 KSB8fCBkZWZpbmVkKFFfV1NfUzYwKQogc3RhdGljIGJvb2wgZ1VzZUZyYW1lRmxhdHRlbmluZyA9 IHRydWU7CiAjZWxzZQogc3RhdGljIGJvb2wgZ1VzZUZyYW1lRmxhdHRlbmluZyA9IGZhbHNlOwpA QCAtNjcyLDcgKzY3Miw3IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnNob3dGUFMoYm9vbCBlbmFi bGUpCiAgICAgdmlldy0+c2V0RnJhbWVSYXRlTWVhc3VyZW1lbnRFbmFibGVkKGVuYWJsZSk7CiAK ICAgICBpZiAoIWVuYWJsZSkgewotI2lmZGVmIFFfV1NfTUFFTU9fNSAmJiBkZWZpbmVkKFFfV1Nf UzYwKQorI2lmIGRlZmluZWQoUV9XU19NQUVNT181KSAmJiBkZWZpbmVkKFFfV1NfUzYwKQogICAg ICAgICBzZXRXaW5kb3dUaXRsZSgiIik7CiAjZWxzZQogICAgICAgICBzdGF0dXNCYXIoKS0+Y2xl YXJNZXNzYWdlKCk7CkBAIC03NzMsNyArNzczLDcgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6dXBk YXRlRlBTKGludCBmcHMpCiB7CiAgICAgUVN0cmluZyBmcHNTdGF0dXNUZXh0ID0gUVN0cmluZygi Q3VycmVudCBGUFM6ICUxIikuYXJnKGZwcyk7CiAKLSNpZmRlZiBRX1dTX01BRU1PXzUgJiYgZGVm aW5lZChRX1dTX1M2MCkKKyNpZiBkZWZpbmVkKFFfV1NfTUFFTU9fNSkgJiYgZGVmaW5lZChRX1dT X1M2MCkKICAgICBzZXRXaW5kb3dUaXRsZShmcHNTdGF0dXNUZXh0KTsKICNlbHNlCiAgICAgc3Rh dHVzQmFyKCktPnNob3dNZXNzYWdlKGZwc1N0YXR1c1RleHQpOwo=