119846 2013-08-15 09:17:00 -0700 [Qt] Do not check specifically for version 5.0 2013-08-15 09:52:18 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen commit-queue dpranke glenn jturcotte oldest_to_newest 917529 0 allan.jensen 2013-08-15 09:17:00 -0700 We currently check for Qt version 5.0 before using the WK1 and WK2 specific layout results. This needs to made generic so it also works on Qt 5.1 and Qt 5.2. The directory names should also be renamed, but removing the version check is probably a better first step. 917531 1 208814 allan.jensen 2013-08-15 09:18:58 -0700 Created attachment 208814 Patch 917537 2 208814 jturcotte 2013-08-15 09:32:40 -0700 Comment on attachment 208814 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208814&action=review > Tools/Scripts/webkitpy/port/qt.py:125 > + # qt-5.x That comment should probably follow the code, it's still named qt-5.0. 917543 3 allan.jensen 2013-08-15 09:52:18 -0700 Committed r154107: <http://trac.webkit.org/changeset/154107> 208814 2013-08-15 09:18:58 -0700 2013-08-15 09:32:40 -0700 Patch bug-119846-20130815181857.patch text/plain 2259 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MTAwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWQxODM3NmE1MzE3N2ZkZmY4NjU3OTk0NjQ1YzhmMWNj NzJiMGVlZS4uOGJiZjI2NmFhMjUxZTEzZmU0Yjg4YzE1NDRiZDQ0Y2M1NDRkOWU3YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEzLTA4LTE1ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgorCisgICAgICAgIFtRdF0gRG8gbm90IGNoZWNrIHNwZWNpZmljYWxseSBmb3IgdmVy c2lvbiA1LjAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExOTg0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZvciBRdCA1Lnggd2Ugc2hvdWxkIGFsd2F5cyB1c2UgYm90aCB3azEgYW5kIHdrMiBiYXNlcGF0 aCByZXN1bHRzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3F0LnB5OgorICAg ICAgICAoUXRQb3J0Ll9zZWFyY2hfcGF0aHMpOgorCiAyMDEzLTA4LTE1ICBTaW1vbiBQZW5hICA8 c2ltb24ucGVuYUBzYW1zdW5nLmNvbT4KIAogICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2Iv MTE5NTg0PiBbR3RrXSBVUkwgcHJpbnRpbmcgY29kZSBpbiBEdW1wUmVuZGVyVHJlZSBkb2Vzbid0 IG1hdGNoIFdUUiBvciBNYWMgRFJUCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvcXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcXQucHkKaW5kZXggNWRk YTc2MmY0Njg3NDRlNzBjYWMxNDU4MzJkMTM2MDk4M2E2ZDNlNi4uYTg3OGIzNDNjZmUzYmVkOWVl MzE0ODk4MGRhZmEzNmUxNzliOWQ3ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L3F0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9xdC5weQpAQCAt MTIwLDIyICsxMjAsMjIgQEAgY2xhc3MgUXRQb3J0KFBvcnQpOgogICAgIGRlZiBfc2VhcmNoX3Bh dGhzKHNlbGYpOgogICAgICAgICAjICAgICAgICAgICAgICAgICBxdC01LjAtbWFjLXdrMgogICAg ICAgICAjICAgICAgICAgICAgICAgIC8KLSAgICAgICAgIyBxdC01LjAtd2sxICAgIHF0LTUuMC13 azIKLSAgICAgICAgIyAgICAgICAgICAgIFwvCi0gICAgICAgICMgICAgICAgICBxdC01LjAKLSAg ICAgICAgIyAgICAgICAgICAgICAgICBcCisgICAgICAgICMgICBxdC01LjAtd2sxICBxdC01LjAt d2syCisgICAgICAgICMgICAgICAgICAgICAgXC8KKyAgICAgICAgIyAgICAgICAgICAgcXQtNS54 CisgICAgICAgICMgICAgICAgICAgICAgICBcCiAgICAgICAgICMgICAgKHF0LWxpbnV4fHF0LW1h Y3xxdC13aW4pCiAgICAgICAgICMgICAgICAgICAgICAgICAgfAogICAgICAgICAjICAgICAgICAg ICAgICAgcXQKICAgICAgICAgc2VhcmNoX3BhdGhzID0gW10KICAgICAgICAgdmVyc2lvbiA9IHNl bGYucXRfdmVyc2lvbigpCi0gICAgICAgIGlmICc1LjAnIGluIHZlcnNpb246Ci0gICAgICAgICAg ICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgotICAgICAgICAgICAg ICAgIGlmIHNlbGYub3BlcmF0aW5nX3N5c3RlbSgpID09ICdtYWMnOgotICAgICAgICAgICAgICAg ICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKCdxdC01LjAtbWFjLXdrMicpCi0gICAgICAgICAgICAg ICAgc2VhcmNoX3BhdGhzLmFwcGVuZCgncXQtNS4wLXdrMicpCi0gICAgICAgICAgICBlbHNlOgot ICAgICAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTUuMC13azEnKQorICAgICAg ICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgorICAgICAgICAgICAg aWYgc2VsZi5vcGVyYXRpbmdfc3lzdGVtKCkgPT0gJ21hYyc6CisgICAgICAgICAgICAgICAgc2Vh cmNoX3BhdGhzLmFwcGVuZCgncXQtNS4wLW1hYy13azInKQorICAgICAgICAgICAgc2VhcmNoX3Bh dGhzLmFwcGVuZCgncXQtNS4wLXdrMicpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWFy Y2hfcGF0aHMuYXBwZW5kKCdxdC01LjAtd2sxJykKKwogICAgICAgICBzZWFyY2hfcGF0aHMuYXBw ZW5kKCdxdC01LjAnKQogCiAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5wb3J0X25h bWUgKyAnLScgKyBzZWxmLm9wZXJhdGluZ19zeXN0ZW0oKSkK