36538 2010-03-24 09:43:32 -0700 [Qt] Add mechanism to detect QtWebKit 2.0 via the preprocessor 2010-04-07 00:30:56 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All CLOSED FIXED Qt P1 Normal --- 35784 1 hausmann diegohcg benjamin commit-queue diegohcg hausmann jturcotte kenneth laszlo.gombos tonikitoo vestbo oldest_to_newest 203448 0 hausmann 2010-03-24 09:43:32 -0700 We need a #define in qtwebkitglobal.h that contains the version of QtWebKit, so that application developers can detect it. 203535 1 kenneth 2010-03-24 12:21:01 -0700 We might need to change our User Agent as well as it currently shows the Qt version. I do not know if this still makes sense. 205625 2 51957 diegohcg 2010-03-29 13:14:40 -0700 Created attachment 51957 Proposed patch Is something like this patch the required? 206012 3 51957 hausmann 2010-03-30 08:16:01 -0700 Comment on attachment 51957 Proposed patch Thanks Diego!! 206014 4 hausmann 2010-03-30 08:17:14 -0700 Jocelyn, Tor Arne: Would be great if you could double check this trivial patch. Thanks :) I recall discussing the name/location of this macro, but it doesn't hurt to double check. 206083 5 jturcotte 2010-03-30 11:19:37 -0700 (In reply to comment #4) > Jocelyn, Tor Arne: Would be great if you could double check this trivial patch. > Thanks :) > > I recall discussing the name/location of this macro, but it doesn't hurt to > double check. I remember having a concern about the ambiguity of QtWebKit's version vs. WebKit's version. The function to get the WebKit's version is called qWebKitVersion(). I would prefer these macros to be called QTWEBKIT_VERSION, QT_WEBKIT_VERSION, QQTWEBKIT_VERSION or QWEBKIT_QTWEBKIT_VERSION instead of QWEBKIT_VERSION. 206268 6 diegohcg 2010-03-30 17:07:50 -0700 > I would prefer these macros to be called QTWEBKIT_VERSION, QT_WEBKIT_VERSION, > QQTWEBKIT_VERSION or QWEBKIT_QTWEBKIT_VERSION instead of QWEBKIT_VERSION. So, in this case I vote for QT_WEBKIT_VERSION. What do you thing guys? 207376 7 52331 diegohcg 2010-04-01 13:56:22 -0700 Created attachment 52331 Changed to use QT_WEBKIT_VERSION using QT_WEBKIT_VERSION 207452 8 51957 eric 2010-04-01 15:57:32 -0700 Comment on attachment 51957 Proposed patch Looks like there was a new version of this patch posted. Obsoleting this one. 209030 9 52632 diegohcg 2010-04-06 07:01:09 -0700 Created attachment 52632 Using QTWEBKIT 209096 10 52632 commit-queue 2010-04-06 10:29:45 -0700 Comment on attachment 52632 Using QTWEBKIT Clearing flags on attachment: 52632 Committed r57155: <http://trac.webkit.org/changeset/57155> 209097 11 commit-queue 2010-04-06 10:29:52 -0700 All reviewed patches have been landed. Closing bug. 209508 12 hausmann 2010-04-07 00:30:31 -0700 Revision r57155 cherry-picked into qtwebkit-2.0 with commit ce3cdb4157cea4f4d80e6498307ea65de2c36b93 51957 2010-03-29 13:14:40 -0700 2010-04-01 15:57:32 -0700 Proposed patch 0001-Qt-Add-mechanism-to-detect-QtWebKit-2.0-via-the-proce.diff text/plain 1750 diegohcg RnJvbSA3MjQ3N2FkODI4NGE2NzAxZmFhZmQwOTY2MWMyZGU2MTdlNjZlZDU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogTW9uLCAyOSBNYXIgMjAxMCAxNjoxMjoxMyAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFtRdF0gQWRkIG1lY2hhbmlzbSB0byBkZXRlY3QgUXRXZWJLaXQgMi4wIHZpYSB0aGUg cHJvY2Vzc29yCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY1MzgK ClBhdGNoIGJ5IERpZWdvIEdvbnphbGV6IDxkaWVnby5nb256YWxlekBvcGVuYm9zc2Eub3JnPgpS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogQXBpL3F3ZWJraXRnbG9iYWwuaDoKLS0tCiBX ZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaCB8ICAgIDYgKysrKysrCiBXZWJLaXQvcXQvQ2hh bmdlTG9nICAgICAgICAgICB8ICAgIDkgKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDE1IGlu c2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9x d2Via2l0Z2xvYmFsLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaAppbmRleCA5ZTg5 NzlmLi5kY2U1M2ZkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaAor KysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaApAQCAtMjIsNiArMjIsMTIgQEAKIAog I2luY2x1ZGUgPFF0Q29yZS9xZ2xvYmFsLmg+CiAKKyNkZWZpbmUgUVdFQktJVF9WRVJTSU9OX1NU UiAiMi4wLjAiCisvLyBRV0VCS0lUX1ZFUlNJT04gaXMgKG1ham9yIDw8IDE2KSArIChtaW5vciA8 PCA4KSArIHBhdGNoLiBTaW1pbGFyIHRvIFF0LgorI2RlZmluZSBRV0VCS0lUX1ZFUlNJT04gMHgw MjAwMDAKKy8vIFVzZTogI2lmIChRV0VCS0lUX1ZFUlNJT04gPj0gUVdFQktJVF9WRVJTSU9OX0NI RUNLKDIsIDAsIDApKS4gU2ltaWxhciB0byBRdC4KKyNkZWZpbmUgUVdFQktJVF9WRVJTSU9OX0NI RUNLKG1ham9yLCBtaW5vciwgcGF0Y2gpICgobWFqb3I8PDE2KXwobWlub3I8PDgpfChwYXRjaCkp CisKICNpZiBkZWZpbmVkKFFUX01BS0VETEwpICAgICAgICAvKiBjcmVhdGUgYSBRdCBETEwgbGli cmFyeSAqLwogIyAgaWYgZGVmaW5lZChCVUlMRF9XRUJLSVQpCiAjICAgICAgZGVmaW5lIFFXRUJL SVRfRVhQT1JUIFFfREVDTF9FWFBPUlQKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cg Yi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDRiYWRkNWYuLjU1YzJmMzYgMTAwNjQ0Ci0tLSBh L1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDEyIEBACisyMDEwLTAzLTI5ICBEaWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6QG9wZW5i b3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XSBBZGQgbWVjaGFuaXNtIHRvIGRldGVjdCBRdFdlYktpdCAyLjAgdmlhIHRoZSBwcm9j ZXNzb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2 NTM4CisKKyAgICAgICAgKiBBcGkvcXdlYmtpdGdsb2JhbC5oOgorCiAyMDEwLTAzLTI5ICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KLS0gCjEuNi4zLjMKCg== 52331 2010-04-01 13:56:22 -0700 2010-04-06 07:01:09 -0700 Changed to use QT_WEBKIT_VERSION 0001-Qt-Add-mechanism-to-detect-QtWebKit-2.0-via-the-proce.diff text/plain 1780 diegohcg RnJvbSAxMDE4NGE5ODIzZWZjOTBjZjQ4ZjYwMzU0MTMzY2Q1OWQ0YjA4YWM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogTW9uLCAyOSBNYXIgMjAxMCAxNjoxMjoxMyAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFtRdF0gQWRkIG1lY2hhbmlzbSB0byBkZXRlY3QgUXRXZWJLaXQgMi4wIHZpYSB0aGUg cHJvY2Vzc29yCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY1MzgK ClBhdGNoIGJ5IERpZWdvIEdvbnphbGV6IDxkaWVnby5nb256YWxlekBvcGVuYm9zc2Eub3JnPgpS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogQXBpL3F3ZWJraXRnbG9iYWwuaDoKLS0tCiBX ZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaCB8ICAgIDYgKysrKysrCiBXZWJLaXQvcXQvQ2hh bmdlTG9nICAgICAgICAgICB8ICAgIDkgKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDE1IGlu c2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9x d2Via2l0Z2xvYmFsLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaAppbmRleCA5ZTg5 NzlmLi5mODFjYmQ1IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaAor KysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaApAQCAtMjIsNiArMjIsMTIgQEAKIAog I2luY2x1ZGUgPFF0Q29yZS9xZ2xvYmFsLmg+CiAKKyNkZWZpbmUgUVRfV0VCS0lUX1ZFUlNJT05f U1RSICIyLjAuMCIKKy8vIFFUX1dFQktJVF9WRVJTSU9OIGlzIChtYWpvciA8PCAxNikgKyAobWlu b3IgPDwgOCkgKyBwYXRjaC4gU2ltaWxhciB0byBRdC4KKyNkZWZpbmUgUVRfV0VCS0lUX1ZFUlNJ T04gMHgwMjAwMDAKKy8vIFVzZTogI2lmIChRVF9XRUJLSVRfVkVSU0lPTiA+PSBRVF9XRUJLSVRf VkVSU0lPTl9DSEVDSygyLCAwLCAwKSkuIFNpbWlsYXIgdG8gUXQuCisjZGVmaW5lIFFUX1dFQktJ VF9WRVJTSU9OX0NIRUNLKG1ham9yLCBtaW5vciwgcGF0Y2gpICgobWFqb3I8PDE2KXwobWlub3I8 PDgpfChwYXRjaCkpCisKICNpZiBkZWZpbmVkKFFUX01BS0VETEwpICAgICAgICAvKiBjcmVhdGUg YSBRdCBETEwgbGlicmFyeSAqLwogIyAgaWYgZGVmaW5lZChCVUlMRF9XRUJLSVQpCiAjICAgICAg ZGVmaW5lIFFXRUJLSVRfRVhQT1JUIFFfREVDTF9FWFBPUlQKZGlmZiAtLWdpdCBhL1dlYktpdC9x dC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGRjNDFmNTUuLjg3NDUyZTkg MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEyIEBACisyMDEwLTAzLTI5ICBEaWVnbyBHb256YWxleiAgPGRpZWdvLmdv bnphbGV6QG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBBZGQgbWVjaGFuaXNtIHRvIGRldGVjdCBRdFdlYktpdCAyLjAg dmlhIHRoZSBwcm9jZXNzb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM2NTM4CisKKyAgICAgICAgKiBBcGkvcXdlYmtpdGdsb2JhbC5oOgorCiAyMDEw LTA0LTAxICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3Nh Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4K LS0gCjEuNi4zLjMKCg== 52632 2010-04-06 07:01:09 -0700 2010-04-06 10:29:45 -0700 Using QTWEBKIT 0002-Qt-Add-mechanism-to-detect-QtWebKit-2.0-via-the-prepr.diff text/plain 1771 diegohcg RnJvbSBmZmIxMDU0ZTRkNjE0YjU0MTA2NjJhNjA5MTNkYzM5OTllMzdkMTI4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogVHVlLCA2IEFwciAyMDEwIDA5OjU5OjI0IC0wNDAwClN1YmplY3Q6IFtQ QVRDSCAyLzJdIFtRdF0gQWRkIG1lY2hhbmlzbSB0byBkZXRlY3QgUXRXZWJLaXQgMi4wIHZpYSB0 aGUgcHJlcHJvY2Vzc29yCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzY1MzgKClBhdGNoIGJ5IERpZWdvIEdvbnphbGV6IDxkaWVnby5nb256YWxlekBvcGVuYm9zc2Eu b3JnPgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogQXBpL3F3ZWJraXRnbG9iYWwuaDoK LS0tCiBXZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaCB8ICAgIDYgKysrKysrCiBXZWJLaXQv cXQvQ2hhbmdlTG9nICAgICAgICAgICB8ICAgIDkgKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQs IDE1IGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L0FwaS9xd2Via2l0Z2xvYmFsLmggYi9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaAppbmRl eCA5ZTg5NzlmLi42NjViZjFiIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9i YWwuaAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJraXRnbG9iYWwuaApAQCAtMjIsNiArMjIsMTIg QEAKIAogI2luY2x1ZGUgPFF0Q29yZS9xZ2xvYmFsLmg+CiAKKyNkZWZpbmUgUVRXRUJLSVRfVkVS U0lPTl9TVFIgIjIuMC4wIgorLy8gUVRXRUJLSVRfVkVSU0lPTiBpcyAobWFqb3IgPDwgMTYpICsg KG1pbm9yIDw8IDgpICsgcGF0Y2guIFNpbWlsYXIgdG8gUXQuCisjZGVmaW5lIFFUV0VCS0lUX1ZF UlNJT04gMHgwMjAwMDAKKy8vIFVzZTogI2lmIChRVFdFQktJVF9WRVJTSU9OID49IFFUV0VCS0lU X1ZFUlNJT05fQ0hFQ0soMiwgMCwgMCkpLiBTaW1pbGFyIHRvIFF0LgorI2RlZmluZSBRVFdFQktJ VF9WRVJTSU9OX0NIRUNLKG1ham9yLCBtaW5vciwgcGF0Y2gpICgobWFqb3I8PDE2KXwobWlub3I8 PDgpfChwYXRjaCkpCisKICNpZiBkZWZpbmVkKFFUX01BS0VETEwpICAgICAgICAvKiBjcmVhdGUg YSBRdCBETEwgbGlicmFyeSAqLwogIyAgaWYgZGVmaW5lZChCVUlMRF9XRUJLSVQpCiAjICAgICAg ZGVmaW5lIFFXRUJLSVRfRVhQT1JUIFFfREVDTF9FWFBPUlQKZGlmZiAtLWdpdCBhL1dlYktpdC9x dC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDdmM2JkMTYuLjI2NzBjZTYg MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEyIEBACisyMDEwLTA0LTA2ICBEaWVnbyBHb256YWxleiAgPGRpZWdvLmdv bnphbGV6QG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBBZGQgbWVjaGFuaXNtIHRvIGRldGVjdCBRdFdlYktpdCAyLjAg dmlhIHRoZSBwcmVwcm9jZXNzb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM2NTM4CisKKyAgICAgICAgKiBBcGkvcXdlYmtpdGdsb2JhbC5oOgorCiAy MDEwLTA0LTAyICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KLS0gCjEuNi4z LjMKCg==