37207 2010-04-07 06:53:52 -0700 [Qt] QtWebKit 2.0 library version needs to be maintained in WebCore.pro 2010-05-02 14:59:40 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All CLOSED FIXED Qt P2 Normal --- 35784 1 hausmann webkit-qt-unassigned jturcotte kenneth koshuin rclbelem oldest_to_newest 209615 0 hausmann 2010-04-07 06:53:52 -0700 Currently WebCore.pro picks up the library version from Qt: CONFIG(QTDIR_build) { include($$QT_SOURCE_TREE/src/qbase.pri) # Qt will set the version for us when building in Qt's tree } else { VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} DESTDIR = $$OUTPUT_DIR/lib !static: DEFINES += QT_MAKEDLL } Instead we should set the version ourselves, i.e. we should start with 4.7.0 in the trunk and in the release branch. 212803 1 53422 koshuin 2010-04-15 04:47:39 -0700 Created attachment 53422 intial suggestion as conversation starter 212804 2 53423 koshuin 2010-04-15 04:48:25 -0700 Created attachment 53423 how it looks on Qt side 212807 3 koshuin 2010-04-15 04:55:22 -0700 Ok some commenting. Symbian needs to know the version of webkit when creating sis packages to make correct dependencies to DLL/installed webkit version. Patch proposes to add a new file containing the version information under WebKit/qt tree where this is then included into webcore.pro. When user makes a application using qtwebkit from Qt tree he will get the version that is currently coming with Qt. if user decides to install new webkit release he'd get the version from that tree. Downside is that he needs to set WEBKITDIR to this to work. Another problem that is not visible from this patch (yet) is that we already have shipped Symbian QtWebkit with version 4.6.2 and upcoming 4.7.1 so we need to start QtWebkit 2.0 version from higher than those to maintain proper dependency to versions. My suggestion is that we start QtWebkit numbering from 20 i.e. every subsequent release of QtWebkit would have it's major version number multiplied by 10. Minor and Patch numbers would not be touched. As you can see in the Qt side there is a fallback version. this fallback number would be used on times when QtWebkit version 2.0 would be installed on top of 4.6 but user would have not set WEBKIT dir. My suggestion for the fallback number is 4.6 or to print warning. 213463 4 hausmann 2010-04-16 16:03:03 -0700 To retain binary compatibility we have to keep on using the major version 4 for the qtwebkit 2.0 release and later. In addition the minor version of the DLL with qtwebkit 2.0 has to be greater than 6. Therefore 4.7 is a natural choice over 2.0 213468 5 hausmann 2010-04-16 16:06:06 -0700 In other words, Janne, when installing qtwebkit 2.0 over an existing Qt installation on Symbian, it is important that the pkg_depends_webkit from symbian/qt.prf includes the correct and _updated_ version number. I think your approach of installing an optionally included .pri file is a good idea. Jocelyn, what do you think? 213944 6 jturcotte 2010-04-19 01:09:25 -0700 (In reply to comment #5) > I think your approach of installing an optionally included .pri file is a good > idea. Jocelyn, what do you think? I'm for that as well (In reply to comment #4) > To retain binary compatibility we have to keep on using the major version 4 for > the qtwebkit 2.0 release and later. > > In addition the minor version of the DLL with qtwebkit 2.0 has to be greater > than 6. > > Therefore 4.7 is a natural choice over 2.0 If we ever create official releases between Qt SDK releases, numbering it 4.7 now will be confusing later. What about starting from 4.20.0 then? 214504 7 koshuin 2010-04-19 23:57:23 -0700 (In reply to comment #6) > (In reply to comment #5) > > I think your approach of installing an optionally included .pri file is a good > > idea. Jocelyn, what do you think? > > I'm for that as well Excellent. > (In reply to comment #4) > > Therefore 4.7 is a natural choice over 2.0 > > If we ever create official releases between Qt SDK releases, numbering it 4.7 > now will be confusing later. > > What about starting from 4.20.0 then? This was my reasoning for setting it to 20.0.0 from start. If next release is 4.7 then what will be the next one... 217033 8 kenneth 2010-04-26 05:37:20 -0700 Any update on this? I'm personally OK with so.4.20 217037 9 jturcotte 2010-04-26 05:46:15 -0700 (In reply to comment #8) > Any update on this? I'm personally OK with so.4.20 Thought about it and 4.20 would cause problems when we get to 2.11. This would limit us to have max 10 minor releases per major. Using 4.200.0 would probably give us enough of them. 217527 10 koshuin 2010-04-26 23:14:53 -0700 (In reply to comment #9) > (In reply to comment #8) > > Any update on this? I'm personally OK with so.4.20 > > Thought about it and 4.20 would cause problems when we get to 2.11. This would > limit us to have max 10 minor releases per major. > > Using 4.200.0 would probably give us enough of them. And what about with Qt 5.0 release ? QtWebkit would still continue with 4.x series? 217574 11 koshuin 2010-04-27 01:14:45 -0700 (In reply to comment #10) > > Using 4.200.0 would probably give us enough of them. Here is an issue. Symbian binaries won't have separate minor and build number so when checking for dll eclipsing we compress minor and build number into 2 bytes leaving 1 byte for each number i.e. minor and build number cannot be larger than 255. 218316 12 hausmann 2010-04-28 04:10:20 -0700 (In reply to comment #11) > (In reply to comment #10) > > > Using 4.200.0 would probably give us enough of them. > > Here is an issue. Symbian binaries won't have separate minor and build number > so when checking for dll eclipsing we compress minor and build number into 2 > bytes leaving 1 byte for each number i.e. minor and build number cannot be > larger than 255. Good point. What's wrong with just 4.7 then? :) If we can't find anything better, then let's continue with what we've done in the past. 218377 13 jturcotte 2010-04-28 06:57:28 -0700 (In reply to comment #12) > What's wrong with just 4.7 then? :) If we can't find anything better, then > let's continue with what we've done in the past. We talked about it a bit here and I also think it would be alright to keep it to 4.7 for this release. - The release and API version is QtWebKit 2.0 (and it's shipped with Qt 4.7, we can also say that it's Qt 4.7's QtWebKit version) - The binary version is 4.7 (even if compiled with Qt 4.6) Since we decided to ship QtWebKit 2.0 with Qt 4.7, the only difference with before is that we support to build it using Qt 4.6. We probably won't get more than one QtWebKit release between Qt releases until a while so until then we will be able to keep the QtWebKit binary version same as Qt's one. Once we get a clearer view on how other Qt external modules want to handle their versions, we'll be able to go in the same direction. 218986 14 54692 koshuin 2010-04-29 06:18:27 -0700 Created attachment 54692 proposed change QtWebkit 2.0 version will be 4.7.0. 219913 15 hausmann 2010-05-02 14:51:16 -0700 Landed in the trunk with 4.8.0, as that's what QtWebKit 2.1's library version is going to be Committed r58661: <http://trac.webkit.org/changeset/58661> 219914 16 hausmann 2010-05-02 14:58:44 -0700 Revision r58661 cherry-picked into qtwebkit-2.0 with commit 09985156d31032da87aab00472943af2860baf04 219915 17 hausmann 2010-05-02 14:59:40 -0700 (In reply to comment #16) > Revision r58661 cherry-picked into qtwebkit-2.0 with commit > 09985156d31032da87aab00472943af2860baf04 I should note that this cherry-pick has the library version set to 4.7.0 instead of 4.8.0 for the trunk. 53422 2010-04-15 04:47:39 -0700 2010-04-29 06:18:27 -0700 intial suggestion as conversation starter suggestion.patch text/plain 992 koshuin ZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5wcm8gYi9XZWJDb3JlL1dlYkNvcmUucHJvCmlu ZGV4IGUwNmZlMjcuLjMzODU5ZmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5wcm8KKysr IGIvV2ViQ29yZS9XZWJDb3JlLnBybwpAQCAtNjgsMTIgKzY4LDEyIEBAIENPTkZJRyhzdGFuZGFs b25lX3BhY2thZ2UpIHsKIAogQ09ORklHKFFURElSX2J1aWxkKSB7CiAgICAgaW5jbHVkZSgkJFFU X1NPVVJDRV9UUkVFL3NyYy9xYmFzZS5wcmkpCi0gICAgIyBRdCB3aWxsIHNldCB0aGUgdmVyc2lv biBmb3IgdXMgd2hlbiBidWlsZGluZyBpbiBRdCdzIHRyZWUKIH0gZWxzZSB7Ci0gICAgVkVSU0lP TiA9ICQke1FUX01BSk9SX1ZFUlNJT059LiQke1FUX01JTk9SX1ZFUlNJT059LiQke1FUX1BBVENI X1ZFUlNJT059CiAgICAgREVTVERJUiA9ICQkT1VUUFVUX0RJUi9saWIKICAgICAhc3RhdGljOiBE RUZJTkVTICs9IFFUX01BS0VETEwKIH0KK2luY2x1ZGUoJCRQV0QvLi4vV2ViS2l0L3F0L3F0d2Vi a2l0X3ZlcnNpb24ucHJpKQorVkVSU0lPTiA9ICQke1FUX1dFQktJVF9NQUpPUl9WRVJTSU9OfS4k JHtRVF9XRUJLSVRfTUlOT1JfVkVSU0lPTn0uJCR7UVRfV0VCS0lUX1BBVENIX1ZFUlNJT059CiAK IHVuaXggewogICAgIFFNQUtFX1BLR0NPTkZJR19SRVFVSVJFUyA9IFF0Q29yZSBRdEd1aSBRdE5l dHdvcmsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9xdHdlYmtpdF92ZXJzaW9uLnByaSBiL1dlYktp dC9xdC9xdHdlYmtpdF92ZXJzaW9uLnByaQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi4yNjE2NjAyCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0L3F0L3F0d2Via2l0X3ZlcnNp b24ucHJpCkBAIC0wLDAgKzEsNCBAQAorUVRfV0VCS0lUX1ZFUlNJT04gPSAyLjAuMAorUVRfV0VC S0lUX01BSk9SX1ZFUlNJT04gPSAyCitRVF9XRUJLSVRfTUlOT1JfVkVSU0lPTiA9IDAKK1FUX1dF QktJVF9QQVRDSF9WRVJTSU9OID0gMAo= 53423 2010-04-15 04:48:25 -0700 2010-04-29 06:18:27 -0700 how it looks on Qt side qt_symbian.patch text/plain 1263 koshuin ZGlmZiAtLWdpdCBhL21rc3BlY3MvZmVhdHVyZXMvc3ltYmlhbi9xdC5wcmYgYi9ta3NwZWNzL2Zl YXR1cmVzL3N5bWJpYW4vcXQucHJmDQppbmRleCBiMjE1NmE5Li44NzA1M2M0IDEwMDY0NA0KLS0t IGEvbWtzcGVjcy9mZWF0dXJlcy9zeW1iaWFuL3F0LnByZg0KKysrIGIvbWtzcGVjcy9mZWF0dXJl cy9zeW1iaWFuL3F0LnByZg0KQEAgLTMxLDkgKzMxLDIyIEBAIGNvbnRhaW5zKENPTkZJRywgcXQp OiFjb250YWlucyhUQVJHRVQuVUlEMywgMHgyMDAxRTYxQyk6IWNvbnRhaW5zKFRBUkdFVC5VSUQz LCAwDQogDQogICAgICMgUHJvamVjdHMgbGlua2luZyB0byB3ZWJraXQgbmVlZCBkZXBlbmRlbmN5 IHRvIHdlYmtpdA0KICAgICBjb250YWlucyhRVCwgd2Via2l0KTogew0KKyAgICAgICAgV0VCS0lU RElSID0gJCQoV0VCS0lURElSKQ0KKyAgICAgICAgaXNFbXB0eShXRUJLSVRESVIpIHsNCisgICAg ICAgICAgICBXRUJLSVRESVIgPSAkJFtRVF9JTlNUQUxMX1BSRUZJWF0vc3JjLzNyZHBhcnR5L3dl YmtpdA0KKyAgICAgICAgfQ0KKyAgICAgICAgV0VCS0lUX1ZFUlNJT05TX1BSSSA9ICQkV0VCS0lU RElSL1dlYktpdC9xdC9xdHdlYmtpdF92ZXJzaW9uLnByaQ0KKyAgICAgICAgZXhpc3RzKCQkV0VC S0lUX1ZFUlNJT05TX1BSSSkgew0KKyAgICAgICAgICAgIGluY2x1ZGUoJCRXRUJLSVRfVkVSU0lP TlNfUFJJKQ0KKyAgICAgICAgfSBlbHNlIHsNCisgICAgICAgICAgICBRVF9XRUJLSVRfTUFKT1Jf VkVSU0lPTiA9IDENCisgICAgICAgICAgICBRVF9XRUJLSVRfTUlOT1JfVkVSU0lPTiA9IDANCisg ICAgICAgICAgICBRVF9XRUJLSVRfUEFUQ0hfVkVSU0lPTiA9IDANCisgICAgICAgIH0NCisNCiAg ICAgICAgIHBrZ19kZXBlbmRzX3dlYmtpdCArPSBcDQogICAgICAgICAgICAgIjsgRGVwZW5kZW5j eSB0byBRdCBXZWJraXQiIFwNCi0gICAgICAgICAgICAiKDB4MjAwMjY3QzIpLCAkJHtRVF9NQUpP Ul9WRVJTSU9OfSwgJCR7UVRfTUlOT1JfVkVSU0lPTn0sICQke1FUX1BBVENIX1ZFUlNJT059LCAg e1wiUXRXZWJLaXRcIn0iDQorICAgICAgICAgICAgIigweDIwMDI2N0MyKSwgJCR7UVRfV0VCS0lU X01BSk9SX1ZFUlNJT059LCAkJHtRVF9XRUJLSVRfTUlOT1JfVkVSU0lPTn0sICQke1FUX1dFQktJ VF9QQVRDSF9WRVJTSU9OfSwgIHtcIlF0V2ViS2l0XCJ9Ig0KICAgICB9IGVsc2Ugew0KICAgICAg ICAgZGVmYXVsdF9kZXBsb3ltZW50LnBrZ19wcmVydWxlcyAtPSBwa2dfZGVwZW5kc193ZWJraXQN CiAgICAgfQ0K 54692 2010-04-29 06:18:27 -0700 2010-05-02 14:37:31 -0700 proposed change webkitversion.diff text/plain 2136 koshuin ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzBkYzI3OC4uYzM4Yjk2YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNC0yOSAgSmFubmUgS29za2lu ZW4gIDxqYW5uZS5wLmtvc2tpbmVuQGRpZ2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0V2ViS2l0IHZlcnNpb25pbmcgYWRkZWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MjA3CisK KyAgICAgICAgUXRXZWJraXQgcmVsZWFzZXMgc2VwYXJhdGVkIGZyb20gUXQgcmVsZWFzZSBjeWNs ZS4KKworICAgICAgICAqIFdlYkNvcmUucHJvOgorCiAyMDEwLTA0LTI4ICBKdXN0aW4gTWNQaGVy c29uIDxqdXN0aW4ubWNwaGVyc29uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBT aW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5wcm8gYi9XZWJDb3Jl L1dlYkNvcmUucHJvCmluZGV4IDI0NmVjNTQuLmFkMGI3YTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv V2ViQ29yZS5wcm8KKysrIGIvV2ViQ29yZS9XZWJDb3JlLnBybwpAQCAtNzAsMTMgKzcwLDEzIEBA IENPTkZJRyhzdGFuZGFsb25lX3BhY2thZ2UpIHsKIAogQ09ORklHKFFURElSX2J1aWxkKSB7CiAg ICAgaW5jbHVkZSgkJFFUX1NPVVJDRV9UUkVFL3NyYy9xYmFzZS5wcmkpCi0gICAgIyBRdCB3aWxs IHNldCB0aGUgdmVyc2lvbiBmb3IgdXMgd2hlbiBidWlsZGluZyBpbiBRdCdzIHRyZWUKIH0gZWxz ZSB7Ci0gICAgVkVSU0lPTiA9ICQke1FUX01BSk9SX1ZFUlNJT059LiQke1FUX01JTk9SX1ZFUlNJ T059LiQke1FUX1BBVENIX1ZFUlNJT059CiAgICAgREVTVERJUiA9ICQkT1VUUFVUX0RJUi9saWIK ICAgICAhc3RhdGljOiBERUZJTkVTICs9IFFUX01BS0VETEwKICAgICBzeW1iaWFuOiBUQVJHRVQg Kz0kJHtRVF9MSUJJTkZJWH0KIH0KK2luY2x1ZGUoJCRQV0QvLi4vV2ViS2l0L3F0L3F0d2Via2l0 X3ZlcnNpb24ucHJpKQorVkVSU0lPTiA9ICQke1FUX1dFQktJVF9NQUpPUl9WRVJTSU9OfS4kJHtR VF9XRUJLSVRfTUlOT1JfVkVSU0lPTn0uJCR7UVRfV0VCS0lUX1BBVENIX1ZFUlNJT059CiAKIHVu aXggewogICAgIFFNQUtFX1BLR0NPTkZJR19SRVFVSVJFUyA9IFF0Q29yZSBRdEd1aSBRdE5ldHdv cmsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9n CmluZGV4IGMzNWM2YTcuLjNkOWUyNTMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEwLTA0LTI5ICBK YW5uZSBLb3NraW5lbiAgPGphbm5lLnAua29za2luZW5AZGlnaWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUXRXZWJLaXQgdmVyc2lv bmluZyBhZGRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzcyMDcKKworICAgICAgICBRdFdlYmtpdCByZWxlYXNlcyBzZXBhcmF0ZWQgZnJvbSBRdCBy ZWxlYXNlIGN5Y2xlLgorCisgICAgICAgICogcXR3ZWJraXRfdmVyc2lvbi5wcmk6IEFkZGVkLgor CiAyMDEwLTA0LTI4ICBKYW5uZSBLb3NraW5lbiAgPGphbm5lLnAua29za2luZW5AZGlnaWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uIDxzaW1vbi5oYXVzbWFubkBu b2tpYS5jb20+CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvcXR3ZWJraXRfdmVyc2lvbi5wcmkgYi9X ZWJLaXQvcXQvcXR3ZWJraXRfdmVyc2lvbi5wcmkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uZmZkMTkyYwotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdC9xdC9xdHdlYmtpdF92 ZXJzaW9uLnByaQpAQCAtMCwwICsxLDQgQEAKK1FUX1dFQktJVF9WRVJTSU9OID0gNC43LjAKK1FU X1dFQktJVF9NQUpPUl9WRVJTSU9OID0gNAorUVRfV0VCS0lUX01JTk9SX1ZFUlNJT04gPSA3CitR VF9XRUJLSVRfUEFUQ0hfVkVSU0lPTiA9IDAK