34975 2010-02-16 04:13:11 -0800 [Qt] Correct build problems while building QtWebKit inside Qt. 2010-02-23 01:59:10 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED Qt P2 Enhancement --- 1 jturcotte webkit-unassigned laszlo.gombos oldest_to_newest 190664 0 jturcotte 2010-02-16 04:13:11 -0800 Building QtWebKit inside Qt's src/3rdparty had some issues 190667 1 48806 jturcotte 2010-02-16 05:05:25 -0800 Created attachment 48806 Patch Patch that corrects the problem. 190808 2 laszlo.gombos 2010-02-16 16:08:24 -0800 Can we replace + !CONFIG(QTDIR_build): TARGET = $$qtLibraryTarget($$TARGET) with + TARGET = $$qtLibraryTarget($$TARGET) These rules are already complex enough, let's try to keep them as simple as possible. 190928 3 48869 jturcotte 2010-02-17 01:44:15 -0800 Created attachment 48869 Patch v2 (In reply to comment #2) Thanks, I missed that one, here is the new patch 191226 4 48869 laszlo.gombos 2010-02-17 14:38:32 -0800 Comment on attachment 48869 Patch v2 Looks good to me, r+. It would be better to assign value to VERSION at same location. Perhaps you can make that change during landing just by moving some code around. Something like this: CONFIG(QTDIR_build) { include($$QT_SOURCE_TREE/src/qbase.pri) # Qt will set the version for us when building in Qt's tree VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } else: VERSION = 4.7.0 192839 5 jturcotte 2010-02-23 01:59:10 -0800 Landed in r55133. Closing bug. 48806 2010-02-16 05:05:25 -0800 2010-02-17 01:44:15 -0800 Patch webcore_pro_qtdirbuild.patch text/plain 1760 jturcotte ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTljMGQ0Yy4uOWQ1MmQyZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMC0wMi0xNiAgSm9jZWx5biBUdXJj b3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQ29ycmVjdCBidWlsZCBwcm9ibGVtcyB3 aGlsZSBidWlsZGluZyBRdFdlYktpdCBpbnNpZGUgUXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDk3NQorCisgICAgICAgICogV2ViQ29yZS5wcm86 IENoYW5nZSB0aGUgY29uZGl0aW9uICFzdGFuZGFsb25lX3BhY2thZ2UgdG8gIVFURElSX2J1aWxk CisKIDIwMTAtMDItMTAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb3IgQXJuZSBWZXN0YsO4LgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9XZWJDb3JlLnBybyBiL1dlYkNvcmUvV2ViQ29yZS5wcm8KaW5kZXggMTNkNjMx NC4uZWIwMWI3ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLnBybworKysgYi9XZWJDb3Jl L1dlYkNvcmUucHJvCkBAIC0yNjg3LDE5ICsyNjg3LDE4IEBAIFdFQktJVF9JTlNUQUxMX0hFQURF UlMgPSAkJFdFQktJVF9BUElfSEVBREVSUyAkJFdFQktJVF9DTEFTU19IRUFERVJTCiAgICAgUU1B S0VfRVhUUkFfVEFSR0VUUyArPSBpbnN0YWxsCiB9CiAKLSMgUXQgd2lsbCBzZXQgdGhlIHZlcnNp b24gZm9yIHVzIHdoZW4gYnVpbGRpbmcgaW4gUXQncyB0cmVlCi0hQ09ORklHKFFURElSX2J1aWxk KTogVkVSU0lPTj0kJHtRVF9NQUpPUl9WRVJTSU9OfS4kJHtRVF9NSU5PUl9WRVJTSU9OfS4kJHtR VF9QQVRDSF9WRVJTSU9OfQotCi13aW4zMi0qfHdpbmNlKiB7Ci0gICAgRExMREVTVERJUiA9ICQk T1VUUFVUX0RJUi9iaW4KLSAgICBUQVJHRVQgPSAkJHF0TGlicmFyeVRhcmdldCgkJFRBUkdFVCkK KyFDT05GSUcoUVRESVJfYnVpbGQpIHsKKyAgICAjIFF0IHdpbGwgc2V0IHRoZSB2ZXJzaW9uIGZv ciB1cyB3aGVuIGJ1aWxkaW5nIGluIFF0J3MgdHJlZQorICAgIFZFUlNJT049JCR7UVRfTUFKT1Jf VkVSU0lPTn0uJCR7UVRfTUlOT1JfVkVSU0lPTn0uJCR7UVRfUEFUQ0hfVkVSU0lPTn0KIAotICAg IGRsbHRhcmdldC5jb21tYW5kcyA9ICQoQ09QWV9GSUxFKSAkKERFU1RESVJfVEFSR0VUKSAkJFtR VF9JTlNUQUxMX0JJTlNdCi0gICAgZGxsdGFyZ2V0LkNPTkZJRyA9IG5vX3BhdGgKLSAgICBJTlNU QUxMUyArPSBkbGx0YXJnZXQKLX0KKyAgICB3aW4zMi0qfHdpbmNlKiB7CisgICAgICAgIERMTERF U1RESVIgPSAkJE9VVFBVVF9ESVIvYmluCisgICAgICAgICFDT05GSUcoUVRESVJfYnVpbGQpOiBU QVJHRVQgPSAkJHF0TGlicmFyeVRhcmdldCgkJFRBUkdFVCkKIAotIUNPTkZJRyhzdGFuZGFsb25l X3BhY2thZ2UpIHsKKyAgICAgICAgZGxsdGFyZ2V0LmNvbW1hbmRzID0gJChDT1BZX0ZJTEUpICQo REVTVERJUl9UQVJHRVQpICQkW1FUX0lOU1RBTExfQklOU10KKyAgICAgICAgZGxsdGFyZ2V0LkNP TkZJRyA9IG5vX3BhdGgKKyAgICAgICAgSU5TVEFMTFMgKz0gZGxsdGFyZ2V0CisgICAgfQogCiAg ICAgdW5peCB7CiAgICAgICAgIENPTkZJRyArPSBjcmVhdGVfcGMgY3JlYXRlX3BybAo= 48869 2010-02-17 01:44:15 -0800 2010-02-17 14:38:31 -0800 Patch v2 webcore_pro_qtdirbuild.patch text/plain 1738 jturcotte ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTljMGQ0Yy4uOWQ1MmQyZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMC0wMi0xNiAgSm9jZWx5biBUdXJj b3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQ29ycmVjdCBidWlsZCBwcm9ibGVtcyB3 aGlsZSBidWlsZGluZyBRdFdlYktpdCBpbnNpZGUgUXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDk3NQorCisgICAgICAgICogV2ViQ29yZS5wcm86 IENoYW5nZSB0aGUgY29uZGl0aW9uICFzdGFuZGFsb25lX3BhY2thZ2UgdG8gIVFURElSX2J1aWxk CisKIDIwMTAtMDItMTAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb3IgQXJuZSBWZXN0YsO4LgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9XZWJDb3JlLnBybyBiL1dlYkNvcmUvV2ViQ29yZS5wcm8KaW5kZXggMTNkNjMx NC4uZWIwMWI3ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLnBybworKysgYi9XZWJDb3Jl L1dlYkNvcmUucHJvCkBAIC0yNjg3LDE5ICsyNjg3LDE4IEBAIFdFQktJVF9JTlNUQUxMX0hFQURF UlMgPSAkJFdFQktJVF9BUElfSEVBREVSUyAkJFdFQktJVF9DTEFTU19IRUFERVJTCiAgICAgUU1B S0VfRVhUUkFfVEFSR0VUUyArPSBpbnN0YWxsCiB9CiAKLSMgUXQgd2lsbCBzZXQgdGhlIHZlcnNp b24gZm9yIHVzIHdoZW4gYnVpbGRpbmcgaW4gUXQncyB0cmVlCi0hQ09ORklHKFFURElSX2J1aWxk KTogVkVSU0lPTj0kJHtRVF9NQUpPUl9WRVJTSU9OfS4kJHtRVF9NSU5PUl9WRVJTSU9OfS4kJHtR VF9QQVRDSF9WRVJTSU9OfQotCi13aW4zMi0qfHdpbmNlKiB7Ci0gICAgRExMREVTVERJUiA9ICQk T1VUUFVUX0RJUi9iaW4KLSAgICBUQVJHRVQgPSAkJHF0TGlicmFyeVRhcmdldCgkJFRBUkdFVCkK KyFDT05GSUcoUVRESVJfYnVpbGQpIHsKKyAgICAjIFF0IHdpbGwgc2V0IHRoZSB2ZXJzaW9uIGZv ciB1cyB3aGVuIGJ1aWxkaW5nIGluIFF0J3MgdHJlZQorICAgIFZFUlNJT049JCR7UVRfTUFKT1Jf VkVSU0lPTn0uJCR7UVRfTUlOT1JfVkVSU0lPTn0uJCR7UVRfUEFUQ0hfVkVSU0lPTn0KIAotICAg IGRsbHRhcmdldC5jb21tYW5kcyA9ICQoQ09QWV9GSUxFKSAkKERFU1RESVJfVEFSR0VUKSAkJFtR VF9JTlNUQUxMX0JJTlNdCi0gICAgZGxsdGFyZ2V0LkNPTkZJRyA9IG5vX3BhdGgKLSAgICBJTlNU QUxMUyArPSBkbGx0YXJnZXQKLX0KKyAgICB3aW4zMi0qfHdpbmNlKiB7CisgICAgICAgIERMTERF U1RESVIgPSAkJE9VVFBVVF9ESVIvYmluCisgICAgICAgIFRBUkdFVCA9ICQkcXRMaWJyYXJ5VGFy Z2V0KCQkVEFSR0VUKQogCi0hQ09ORklHKHN0YW5kYWxvbmVfcGFja2FnZSkgeworICAgICAgICBk bGx0YXJnZXQuY29tbWFuZHMgPSAkKENPUFlfRklMRSkgJChERVNURElSX1RBUkdFVCkgJCRbUVRf SU5TVEFMTF9CSU5TXQorICAgICAgICBkbGx0YXJnZXQuQ09ORklHID0gbm9fcGF0aAorICAgICAg ICBJTlNUQUxMUyArPSBkbGx0YXJnZXQKKyAgICB9CiAKICAgICB1bml4IHsKICAgICAgICAgQ09O RklHICs9IGNyZWF0ZV9wYyBjcmVhdGVfcHJsCg==