68114 2011-09-14 14:03:47 -0700 [Qt] Replace QT_GCC_X as they don't exist in Qt5 anymore. 2011-09-15 12:19:19 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED Qt, QtTriaged P2 Normal --- 68180 1 menard menard benjamin hausmann kling noam webkit.review.bot oldest_to_newest 467320 0 menard 2011-09-14 14:03:47 -0700 [Qt] Replace QT_GCC_X as they don't exist in Qt5 anymore. 467332 1 107392 menard 2011-09-14 14:13:44 -0700 Created attachment 107392 Patch 467365 2 107392 kenneth 2011-09-14 14:54:30 -0700 Comment on attachment 107392 Patch Ok, I trust you on this one 467603 3 107392 webkit.review.bot 2011-09-14 21:32:23 -0700 Comment on attachment 107392 Patch Clearing flags on attachment: 107392 Committed r95163: <http://trac.webkit.org/changeset/95163> 467604 4 webkit.review.bot 2011-09-14 21:32:28 -0700 All reviewed patches have been landed. Closing bug. 467725 5 107392 hausmann 2011-09-15 03:24:46 -0700 Comment on attachment 107392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107392&action=review > ChangeLog:3 > + [Qt] Replace QT_GCC_X as they don't exist in Qt5 anymore. Hang on, I think this was a mistake. Commit 7493ee1c44a16dc3b155a5bf3ed7ca966a71072a in qtbase accidentally removed these qmake variables. > Source/WebKit.pri:99 > + GCC_VERSION = $$system(gcc -dumpversion) > + GCC_VERSION = $$split(GCC_VERSION, ".") This seems wrong to me in the context of cross compilation. 467726 6 hausmann 2011-09-15 03:32:39 -0700 I submitted http://paste.ubuntu.com/689876/ for review and inclusion into qtbase. Once that change is in, then I think we should back out r95163. 467739 7 menard 2011-09-15 05:08:27 -0700 (In reply to comment #6) > I submitted http://paste.ubuntu.com/689876/ for review and inclusion into qtbase. Once that change is in, then I think we should back out r95163. I tried to get brad with no success. Btw his patch was submitted reviewed by himself :D. Still it is semantically wrong, QT_GCC_X tells you which compiler version Qt was built, not the one you are actually building. I haven't though about the context of cross compilation can we get the compiler path in qmake? I mean the one that will be used to compile so I can invoke that variable rather than "gcc"? 467746 8 hausmann 2011-09-15 05:27:28 -0700 (In reply to comment #7) > (In reply to comment #6) > > I submitted http://paste.ubuntu.com/689876/ for review and inclusion into qtbase. Once that change is in, then I think we should back out r95163. > > I tried to get brad with no success. Btw his patch was submitted reviewed by himself :D. > > Still it is semantically wrong, QT_GCC_X tells you which compiler version Qt was built, not the one you are actually building. I think it is correct, because qmake doesn't really support using one compiler for Qt and another one for apps. There's only host compilers for some host tools in Qt and then _the_ target compiler. Differently put: I don't think we should bother about any other setups :) > I haven't though about the context of cross compilation can we get the compiler path in qmake? I mean the one that will be used to compile so I can invoke that variable rather than "gcc"? QMAKE_CC and QMAKE_CXX would be correct. But you'd have to duplicate what configure is doing (check if it's gcc, distinguish between major and minor releases in the output). Is it really worth it? :) 467905 9 hausmann 2011-09-15 10:55:13 -0700 The Qt fix went in and is now on Gitorious: http://qt.gitorious.org/qt/qtbase/commit/80d406ce39d23ec6c859b9aa427dee8d0d3c9d50 107392 2011-09-14 14:13:44 -0700 2011-09-15 03:24:46 -0700 Patch bug-68114-20110914181341.patch text/plain 3882 menard SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDk1MTIw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDkt MTQgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAg ICAgW1F0XSBSZXBsYWNlIFFUX0dDQ19YIGFzIHRoZXkgZG9uJ3QgZXhpc3QgaW4gUXQ1IGFueW1v cmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODEx NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxh Y2UgUVRfR0NDX1ggdmFyaWFibGVzLCB0aGV5IGhhdmUgYmVlbiByZW1vdmVkIGluIFF0NS4gSXQg d2FzCisgICAgICAgIGFjdHVhbGx5IHdyb25nIHRvIHVzZSB0aGVtIGJlY2F1c2UgdGhleSB0ZWxs IGFib3V0IHdoaWNoIEdDQyB2ZXJzaW9uCisgICAgICAgIFF0IGhhcyBiZWVuIGNvbXBpbGVkLCBu b3QgdGhlIGN1cnJlbnQgdmVyc2lvbiBvZiBHQ0MgdXNlIHRvIGJ1aWxkIHdlYmtpdC4KKyAgICAg ICAgSSB1c2UgZ2NjIC1kdW1wdmVyc2lvbiB0byBnZXQgaXQuCisKKyAgICAgICAgKiBTb3VyY2Uv V2ViS2l0LnByaToKKwogMjAxMS0wOS0xNCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3ZWQgYnVpbGRmaXggYWZ0ZXIgcjk1MTA3 LgpJbmRleDogU291cmNlL1dlYktpdC5wcmkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC5w cmkJKHJldmlzaW9uIDk1MTEzKQorKysgU291cmNlL1dlYktpdC5wcmkJKHdvcmtpbmcgY29weSkK QEAgLTk1LDggKzk1LDExIEBAIENPTkZJRyAtPSB3YXJuX29uCiAjIFRyZWF0IHdhcm5pbmdzIGFz IGVycm9ycyBvbiB4ODYvTGludXgvR0NDCiBsaW51eC1nKysqIHsKICAgICBpc0VxdWFsKFFUX0FS Q0gseDg2XzY0KXxpc0VxdWFsKFFUX0FSQ0gsaTM4Nik6IFFNQUtFX0NYWEZMQUdTICs9IC1XZXJy b3IKLQotICAgIGdyZWF0ZXJUaGFuKFFUX0dDQ19NQUpPUl9WRVJTSU9OLCAzKTpncmVhdGVyVGhh bihRVF9HQ0NfTUlOT1JfVkVSU0lPTiwgNSkgeworICAgIEdDQ19WRVJTSU9OID0gJCRzeXN0ZW0o Z2NjIC1kdW1wdmVyc2lvbikKKyAgICBHQ0NfVkVSU0lPTiA9ICQkc3BsaXQoR0NDX1ZFUlNJT04s ICIuIikKKyAgICBHQ0NfTUFKT1JfVkVSU0lPTiA9ICQkZmlyc3QoR0NDX1ZFUlNJT04pCisgICAg R0NDX01JTk9SX1ZFUlNJT04gPSAkJG1lbWJlcihHQ0NfVkVSU0lPTiwgMSkKKyAgICBncmVhdGVy VGhhbihHQ0NfTUFKT1JfVkVSU0lPTiwgMyk6Z3JlYXRlclRoYW4oR0NDX01JTk9SX1ZFUlNJT04s IDUpIHsKICAgICAgICAgaWYgKCFjb250YWlucyhRTUFLRV9DWFhGTEFHUywgLXN0ZD1jKysweCkg JiYgIWNvbnRhaW5zKFFNQUtFX0NYWEZMQUdTLCAtc3RkPWdudSsrMHgpKSB7CiAgICAgICAgICAg ICAjIFdlIG5lZWQgdG8gZGVhY3RpdmF0ZSB0aG9zZSB3YXJuaW5ncyBiZWNhdXNlIHNvbWUgbmFt ZXMgY29uZmxpY3RzIHdpdGggdXBjb21pbmcgYysrMHggdHlwZXMgKGUuZy5udWxscHRyKS4KICAg ICAgICAgICAgIFFNQUtFX0NGTEFHU19XQVJOX09OICs9IC1Xbm8tYysrMHgtY29tcGF0CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1MTIwKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEx LTA5LTE0ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisg ICAgICAgIFtRdF0gUmVwbGFjZSBRVF9HQ0NfWCBhcyB0aGV5IGRvbid0IGV4aXN0IGluIFF0NSBh bnltb3JlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjgxMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgdGhlIG5ldyBHQ0NfWCB2YXJpYWJsZXMgZGVmaW5lZCBpbiBXZWJLaXQucHJpIHRvIHJlcGxh Y2UKKyAgICAgICAgdGhlIHVzYWdlIG9mIFFUX0dDQ19YLgorCisgICAgICAgICogSmF2YVNjcmlw dENvcmUucHJvOgorCiAyMDExLTA5LTE0ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguICBUdXJuIG9mZiB0aWVyZWQgY29tcGls YXRpb24uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUucHJvCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5wcm8JKHJl dmlzaW9uIDk1MTEzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnBy bwkod29ya2luZyBjb3B5KQpAQCAtMzMsNyArMzMsNyBAQCBDT05GSUcoUVRESVJfYnVpbGQpIHsK IAogIyBSdWxlcyB3aGVuIEpJVCBlbmFibGVkIChub3QgZGlzYWJsZWQpCiAhY29udGFpbnMoREVG SU5FUywgRU5BQkxFX0pJVD0wKSB7Ci0gICAgbGludXgqLWcrKyo6Z3JlYXRlclRoYW4oUVRfR0ND X01BSk9SX1ZFUlNJT04sMyk6Z3JlYXRlclRoYW4oUVRfR0NDX01JTk9SX1ZFUlNJT04sMCkgewor ICAgIGxpbnV4Ki1nKysqOmdyZWF0ZXJUaGFuKEdDQ19NQUpPUl9WRVJTSU9OLDMpOmdyZWF0ZXJU aGFuKEdDQ19NSU5PUl9WRVJTSU9OLDApIHsKICAgICAgICAgUU1BS0VfQ1hYRkxBR1MgKz0gLWZu by1zdGFjay1wcm90ZWN0b3IKICAgICAgICAgUU1BS0VfQ0ZMQUdTICs9IC1mbm8tc3RhY2stcHJv dGVjdG9yCiAgICAgfQpAQCAtMjE0LDE1ICsyMTQsMTUgQEAgc3ltYmlhbjogewogICAgIFFNQUtF X0NYWEZMQUdTLkFSTUNDICs9IC1PVGltZSAtTzMKIH0KIAotbGVzc1RoYW4oUVRfR0NDX01BSk9S X1ZFUlNJT04sIDUpIHsKK2xlc3NUaGFuKEdDQ19NQUpPUl9WRVJTSU9OLCA1KSB7CiAgICAgIyBH Q0MgNC41IGFuZCBiZWZvcmUKLSAgICBsZXNzVGhhbihRVF9HQ0NfTUlOT1JfVkVSU0lPTiwgNikg eworICAgIGxlc3NUaGFuKEdDQ19NSU5PUl9WRVJTSU9OLCA2KSB7CiAgICAgICAgICMgRGlzYWJs ZSBDKysweCBtb2RlIGluIEpTQyBmb3IgdGhvc2Ugd2hvIGVuYWJsZWQgaXQgaW4gdGhlaXIgUXQn cyBta3NwZWMuCiAgICAgICAgICotZysrKjpRTUFLRV9DWFhGTEFHUyAtPSAtc3RkPWMrKzB4IC1z dGQ9Z251KysweAogICAgIH0KIAogICAgICMgR0NDIDQuNiBhbmQgYWZ0ZXIuCi0gICAgZ3JlYXRl clRoYW4oUVRfR0NDX01JTk9SX1ZFUlNJT04sIDUpIHsKKyAgICBncmVhdGVyVGhhbihHQ0NfTUlO T1JfVkVSU0lPTiwgNSkgewogICAgICAgICBpZiAoIWNvbnRhaW5zKFFNQUtFX0NYWEZMQUdTLCAt c3RkPWMrKzB4KSAmJiAhY29udGFpbnMoUU1BS0VfQ1hYRkxBR1MsIC1zdGQ9Z251KysweCkpIHsK ICAgICAgICAgICAgICMgV2UgbmVlZCB0byBkZWFjdGl2YXRlIHRob3NlIHdhcm5pbmdzIGJlY2F1 c2Ugc29tZSBuYW1lcyBjb25mbGljdHMgd2l0aCB1cGNvbWluZyBjKysweCB0eXBlcyAoZS5nLm51 bGxwdHIpLgogICAgICAgICAgICAgUU1BS0VfQ0ZMQUdTX1dBUk5fT04gKz0gLVduby1jKysweC1j b21wYXQK