36389 2010-03-19 14:06:50 -0700 [Qt] Remove support for Qt v4.4 2010-03-23 05:52:29 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED Qt P3 Normal --- 1 laszlo.gombos laszlo.gombos commit-queue hausmann jedrzej.nowacki tonikitoo oldest_to_newest 202029 0 laszlo.gombos 2010-03-19 14:06:50 -0700 Support for 4.4 should be removed. 202037 1 51187 laszlo.gombos 2010-03-19 14:23:50 -0700 Created attachment 51187 proposed patch 202476 2 jedrzej.nowacki 2010-03-22 07:25:11 -0700 I have found another places, for example WebCore/platform/qt/KURLQt.cpp:#if QT_VERSION < 0x040500 WebCore/platform/qt/KURLQt.cpp:#if QT_VERSION < 0x040500 WebKit/qt/WebCoreSupport/EditorClientQt.cpp:#if QT_VERSION < 0x040500 I suggest to run 'git grep "QT_VERSION"' to find more :-) 202523 3 jedrzej.nowacki 2010-03-22 09:06:08 -0700 (In reply to comment #2) > I have found another places, for example > > WebCore/platform/qt/KURLQt.cpp:#if QT_VERSION < 0x040500 > WebCore/platform/qt/KURLQt.cpp:#if QT_VERSION < 0x040500 > WebKit/qt/WebCoreSupport/EditorClientQt.cpp:#if QT_VERSION < 0x040500 > > I suggest to run 'git grep "QT_VERSION"' to find more :-) Sorry, I just skipped two of them. Looks good to me. 202793 4 hausmann 2010-03-22 15:23:36 -0700 Assigning to Laszlo, so it doesn't show up in the list of untriaged bugs. This one is triaged :) 203009 5 51187 commit-queue 2010-03-23 05:52:25 -0700 Comment on attachment 51187 proposed patch Clearing flags on attachment: 51187 Committed r56386: <http://trac.webkit.org/changeset/56386> 203010 6 commit-queue 2010-03-23 05:52:29 -0700 All reviewed patches have been landed. Closing bug. 51187 2010-03-19 14:23:50 -0700 2010-03-23 05:52:24 -0700 proposed patch 36389.patch text/plain 13041 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NjI2NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDMtMTkgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gUmVtb3ZlIHN1cHBvcnQgZm9yIFF0IHY0LjQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2Mzg5CisKKyAgICAgICAgTm8gbmV3IHRl c3RzIGFzIHRoZXJlIGlzIG5vIG5ldyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogV2ViQ29y ZS5wcmk6CisgICAgICAgICogV2ViQ29yZS5wcm86CisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9xdC9SZXNvdXJjZUhhbmRsZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFu ZGxlOjp3aWxsTG9hZEZyb21DYWNoZSk6CisgICAgICAgICogcGxhdGZvcm0vcXQvQ29va2llSmFy UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0Q29va2llcyk6CisgICAgICAgIChXZWJDb3Jl Ojpjb29raWVzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9LVVJMUXQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6S1VSTDo6b3BlcmF0b3IgUVVybCk6CisgICAgICAgICogcGxhdGZvcm0vcXQvU2Ny b2xsYmFyVGhlbWVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxiYXJUaGVtZVF0Ojpw YWludFNjcm9sbENvcm5lcik6CisgICAgICAgICogcGx1Z2lucy9tYWMvUGx1Z2luVmlld01hYy5j cHA6CisKIDIwMTAtMDMtMTkgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFdpbmRvd3MgY2xlYW4gYnVpbGQgZml4IGFmdGVyIHI1NjE5MgpJbmRleDogV2ViQ29yZS9X ZWJDb3JlLnByaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUucHJpCShyZXZpc2lvbiA1 NjI1NSkKKysrIFdlYkNvcmUvV2ViQ29yZS5wcmkJKHdvcmtpbmcgY29weSkKQEAgLTk4LDcgKzk4 LDcgQEAgZ3JlYXRlclRoYW4oUVRfTUlOT1JfVkVSU0lPTiwgNSkgewogCiAjIFhTTFQgc3VwcG9y dCB3aXRoIFF0WG1sUGF0dGVybnMKICFjb250YWlucyhERUZJTkVTLCBFTkFCTEVfWFNMVD0uKSB7 Ci0gICAgY29udGFpbnMoUVRfQ09ORklHLCB4bWxwYXR0ZXJucyk6IWxlc3NUaGFuKFFUX01JTk9S X1ZFUlNJT04sIDUpOkRFRklORVMgKz0gRU5BQkxFX1hTTFQ9MQorICAgIGNvbnRhaW5zKFFUX0NP TkZJRywgeG1scGF0dGVybnMpOkRFRklORVMgKz0gRU5BQkxFX1hTTFQ9MQogICAgIGVsc2U6REVG SU5FUyArPSBFTkFCTEVfWFNMVD0wCiB9CiAKSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnBybwkocmV2aXNpb24gNTYyNTUpCisrKyBXZWJD b3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0yODg2LDggKzI4ODYsNyBAQCBXRUJL SVRfSU5TVEFMTF9IRUFERVJTID0gJCRXRUJLSVRfQVBJX0hFCiAgICAgfQogfQogCi1DT05GSUco UVRESVJfYnVpbGQpOmlzRXF1YWwoUVRfTUFKT1JfVkVSU0lPTiwgNCk6Z3JlYXRlclRoYW4oUVRf TUlOT1JfVkVSU0lPTiwgNCkgewotICAgICMgc3RhcnQgd2l0aCA0LjUKK0NPTkZJRyhRVERJUl9i dWlsZCkgewogICAgICMgUmVtb3ZlIHRoZSBmb2xsb3dpbmcgMiBsaW5lcyBpZiB5b3Ugd2FudCBk ZWJ1ZyBpbmZvcm1hdGlvbiBpbiBXZWJDb3JlCiAgICAgQ09ORklHIC09IHNlcGFyYXRlX2RlYnVn X2luZm8KICAgICBDT05GSUcgKz0gbm9fZGVidWdfaW5mbwpJbmRleDogV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3F0L1Jlc291cmNlSGFuZGxlUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9xdC9SZXNvdXJjZUhhbmRsZVF0LmNwcAkocmV2aXNpb24gNTYyNTUp CisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUmVzb3VyY2VIYW5kbGVRdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ1LDkgKzQ1LDcgQEAKICNpbmNsdWRlICJxd2ViZnJhbWVfcC5oIgog I2luY2x1ZGUgInF3ZWJwYWdlX3AuaCIKIAotI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA1MDAKICNp bmNsdWRlIDxRQWJzdHJhY3ROZXR3b3JrQ2FjaGU+Ci0jZW5kaWYKICNpbmNsdWRlIDxRQ29yZUFw cGxpY2F0aW9uPgogI2luY2x1ZGUgPFFVcmw+CiAjaW5jbHVkZSA8UU5ldHdvcmtBY2Nlc3NNYW5h Z2VyPgpAQCAtMTYwLDcgKzE1OCw2IEBAIGJvb2wgUmVzb3VyY2VIYW5kbGU6OndpbGxMb2FkRnJv bUNhY2hlKFIKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSNpZiBR VF9WRVJTSU9OID49IDB4MDQwNTAwCiAgICAgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKiBtYW5hZ2Vy ID0gUVdlYkZyYW1lUHJpdmF0ZTo6a2l0KGZyYW1lKS0+cGFnZSgpLT5uZXR3b3JrQWNjZXNzTWFu YWdlcigpOwogICAgIFFBYnN0cmFjdE5ldHdvcmtDYWNoZSogY2FjaGUgPSBtYW5hZ2VyLT5jYWNo ZSgpOwogCkBAIC0xNzQsOSArMTcxLDYgQEAgYm9vbCBSZXNvdXJjZUhhbmRsZTo6d2lsbExvYWRG cm9tQ2FjaGUoUgogICAgIH0KIAogICAgIHJldHVybiBmYWxzZTsKLSNlbHNlCi0gICAgcmV0dXJu IGZhbHNlOwotI2VuZGlmCiB9CiAKIGJvb2wgUmVzb3VyY2VIYW5kbGU6OnN1cHBvcnRzQnVmZmVy ZWREYXRhKCkKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFyUXQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFyUXQuY3BwCShyZXZpc2lvbiA1 NjI1NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vcXQvQ29va2llSmFyUXQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC02Nyw3ICs2Nyw2IEBAIHZvaWQgc2V0Q29va2llcyhEb2N1bWVudCogZG9jdW1lbnQs IGNvbnMKICAgICAgICAgcmV0dXJuOwogCiAgICAgUUxpc3Q8UU5ldHdvcmtDb29raWU+IGNvb2tp ZXMgPSBRTmV0d29ya0Nvb2tpZTo6cGFyc2VDb29raWVzKFFTdHJpbmcodmFsdWUpLnRvQXNjaWko KSk7Ci0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDUwMAogICAgIFFMaXN0PFFOZXR3b3JrQ29va2ll Pjo6SXRlcmF0b3IgaXQgPSBjb29raWVzLmJlZ2luKCk7CiAgICAgd2hpbGUgKGl0ICE9IGNvb2tp ZXMuZW5kKCkpIHsKICAgICAgICAgaWYgKGl0LT5pc0h0dHBPbmx5KCkpCkBAIC03NSw3ICs3NCw2 IEBAIHZvaWQgc2V0Q29va2llcyhEb2N1bWVudCogZG9jdW1lbnQsIGNvbnMKICAgICAgICAgZWxz ZQogICAgICAgICAgICAgKytpdDsKICAgICB9Ci0jZW5kaWYKICAgICBqYXItPnNldENvb2tpZXNG cm9tVXJsKGNvb2tpZXMsIHUpOwogfQogCkBAIC05MiwxMCArOTAsOCBAQCBTdHJpbmcgY29va2ll cyhjb25zdCBEb2N1bWVudCogZG9jdW1lbnQsCiAKICAgICBRU3RyaW5nTGlzdCByZXN1bHRDb29r aWVzOwogICAgIGZvcmVhY2ggKFFOZXR3b3JrQ29va2llIG5ldHdvcmtDb29raWUsIGNvb2tpZXMp IHsKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNTAwCiAgICAgICAgIGlmIChuZXR3b3JrQ29va2ll LmlzSHR0cE9ubHkoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotI2VuZGlmCiAgICAgICAgIHJl c3VsdENvb2tpZXMuYXBwZW5kKFFTdHJpbmc6OmZyb21Bc2NpaSgKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbmV0d29ya0Nvb2tpZS50b1Jhd0Zvcm0oUU5ldHdvcmtDb29raWU6Ok5hbWVB bmRWYWx1ZU9ubHkpLmNvbnN0RGF0YSgpKSk7CiAgICAgfQpJbmRleDogV2ViQ29yZS9wbGF0Zm9y bS9xdC9LVVJMUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vcXQvS1VSTFF0 LmNwcAkocmV2aXNpb24gNTYyNTUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3F0L0tVUkxRdC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI3LDE0ICsyNyw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotI2lmIFFUX1ZFUlNJT04gPCAweDA0MDUwMAotc3RhdGljIGNvbnN0IGNoYXIgaGV4bnVtYmVy c1tdID0gIjAxMjM0NTY3ODlBQkNERUYiOwotc3RhdGljIGlubGluZSBjaGFyIHRvSGV4KGNoYXIg YykKLXsKLSAgICByZXR1cm4gaGV4bnVtYmVyc1tjICYgMHhmXTsKLX0KLSNlbmRpZgotCiBLVVJM OjpLVVJMKGNvbnN0IFFVcmwmIHVybCkKIHsKICAgICAqdGhpcyA9IEtVUkwoS1VSTCgpLCB1cmwu dG9FbmNvZGVkKCkuY29uc3REYXRhKCksIFVURjhFbmNvZGluZygpKTsKQEAgLTQyLDUzICszNCw4 IEBAIEtVUkw6OktVUkwoY29uc3QgUVVybCYgdXJsKQogCiBLVVJMOjpvcGVyYXRvciBRVXJsKCkg Y29uc3QKIHsKLSNpZiBRVF9WRVJTSU9OIDwgMHgwNDA1MDAKLSAgICB1bnNpZ25lZCBsZW5ndGgg PSBtX3N0cmluZy5sZW5ndGgoKTsKLQotICAgIFFCeXRlQXJyYXkgYmE7Ci0gICAgYmEucmVzZXJ2 ZShsZW5ndGgpOwotCi0gICAgaW50IHBhdGggPSAtMTsKLSAgICBpbnQgaG9zdCA9IG1fc3RyaW5n LmZpbmQoIjovLyIpOwotICAgIGlmIChob3N0ICE9IC0xKSB7Ci0gICAgICAgIGhvc3QgKz0gMzsK LQotICAgICAgICBwYXRoID0gbV9zdHJpbmcuZmluZCgnLycsIGhvc3QpOwotICAgIH0KLQotICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewotICAgICAgICBjb25zdCBj aGFyIGNociA9IHN0YXRpY19jYXN0PGNoYXI+KG1fc3RyaW5nW2ldKTsKLQotICAgICAgICBzd2l0 Y2ggKGNocikgewotICAgICAgICAgICAgZW5jb2RlOgotICAgICAgICAgICAgY2FzZSAneyc6Ci0g ICAgICAgICAgICBjYXNlICd9JzoKLSAgICAgICAgICAgIGNhc2UgJ3wnOgotICAgICAgICAgICAg Y2FzZSAnXFwnOgotICAgICAgICAgICAgY2FzZSAnXic6Ci0gICAgICAgICAgICBjYXNlICdgJzoK LSAgICAgICAgICAgICAgICBiYS5hcHBlbmQoJyUnKTsKLSAgICAgICAgICAgICAgICBiYS5hcHBl bmQodG9IZXgoKGNociAmIDB4ZjApID4+IDQpKTsKLSAgICAgICAgICAgICAgICBiYS5hcHBlbmQo dG9IZXgoY2hyICYgMHhmKSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBj YXNlICdbJzoKLSAgICAgICAgICAgIGNhc2UgJ10nOgotICAgICAgICAgICAgICAgIC8vIHNwZWNp YWwgY2FzZTogaWYgdGhpcyBpcyB0aGUgaG9zdCBwYXJ0LCBkb24ndCBlbmNvZGUKLSAgICAgICAg ICAgICAgICAvLyBvdGhlcndpc2UsIGVuY29kZQotICAgICAgICAgICAgICAgIGlmIChob3N0ID09 IC0xIHx8IChwYXRoICE9IC0xICYmIGkgPj0gcGF0aCkpCi0gICAgICAgICAgICAgICAgICAgIGdv dG8gZW5jb2RlOwotICAgICAgICAgICAgICAgIC8vIGZhbGwgdGhyb3VnaAotICAgICAgICAgICAg ZGVmYXVsdDoKLSAgICAgICAgICAgICAgICBiYS5hcHBlbmQoY2hyKTsKLSAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgfQotICAgIH0KLSNlbHNlCi0gICAgLy8gUXQgNC41IG9yIGxhdGVy Ci0gICAgLy8gTm8gbmVlZCBmb3Igc3BlY2lhbCBlbmNvZGluZwogICAgIFFTdHJpbmcgc3RyID0g UVN0cmluZzo6ZnJvbVJhd0RhdGEocmVpbnRlcnByZXRfY2FzdDxjb25zdCBRQ2hhcio+KG1fc3Ry aW5nLmNoYXJhY3RlcnMoKSksIG1fc3RyaW5nLmxlbmd0aCgpKTsKICAgICBRQnl0ZUFycmF5IGJh ID0gc3RyLnRvVXRmOCgpOwotI2VuZGlmCiAKICAgICBRVXJsIHVybCA9IFFVcmw6OmZyb21FbmNv ZGVkKGJhKTsKICAgICByZXR1cm4gdXJsOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9xdC9TY3Jv bGxiYXJUaGVtZVF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3F0L1Njcm9s bGJhclRoZW1lUXQuY3BwCShyZXZpc2lvbiA1NjI1NSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vcXQv U2Nyb2xsYmFyVGhlbWVRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzMyw5ICsyMzMsNiBAQCB2 b2lkIFNjcm9sbGJhclRoZW1lUXQ6OnBhaW50U2Nyb2xsQ29ybmVyCiAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotI2lmIFFUX1ZFUlNJT04gPCAweDA0MDUwMAotICAgIGNvbnRleHQtPmZpbGxSZWN0 KHJlY3QsIFFBcHBsaWNhdGlvbjo6cGFsZXR0ZSgpLmNvbG9yKFFQYWxldHRlOjpOb3JtYWwsIFFQ YWxldHRlOjpXaW5kb3cpLCBEZXZpY2VDb2xvclNwYWNlKTsKLSNlbHNlCiAgICAgU3R5bGVQYWlu dGVyIHAodGhpcywgY29udGV4dCk7CiAgICAgaWYgKCFwLmlzVmFsaWQoKSkKICAgICAgICAgcmV0 dXJuOwpAQCAtMjQzLDcgKzI0MCw2IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVRdDo6cGFpbnRTY3Jv bGxDb3JuZXIKICAgICBRU3R5bGVPcHRpb24gb3B0aW9uOwogICAgIG9wdGlvbi5yZWN0ID0gcmVj dDsKICAgICBwLmRyYXdQcmltaXRpdmUoUVN0eWxlOjpQRV9QYW5lbFNjcm9sbEFyZWFDb3JuZXIs IG9wdGlvbik7Ci0jZW5kaWYKIH0KIAogUVN0eWxlKiBTY3JvbGxiYXJUaGVtZVF0OjpzdHlsZSgp IGNvbnN0CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvbWFjL1BsdWdpblZpZXdNYWMuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9tYWMvUGx1Z2luVmlld01hYy5jcHAJKHJldmlzaW9u IDU2MjU1KQorKysgV2ViQ29yZS9wbHVnaW5zL21hYy9QbHVnaW5WaWV3TWFjLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNzgsMTEgKzc4LDcgQEAgdXNpbmcgSlNDOjpVU3RyaW5nOwogI2luY2x1ZGUg PFFQYWludGVyPgogI2luY2x1ZGUgIlFXZWJQYWdlQ2xpZW50LmgiCiBRVF9CRUdJTl9OQU1FU1BB Q0UKLSNpZiBRVF9WRVJTSU9OIDwgMHgwNDA1MDAKLWV4dGVybiBRX0dVSV9FWFBPUlQgV2luZG93 UHRyIHF0X21hY193aW5kb3dfZm9yKGNvbnN0IFFXaWRnZXQqIHcpOwotI2Vsc2UKIGV4dGVybiBR X0dVSV9FWFBPUlQgT1NXaW5kb3dSZWYgcXRfbWFjX3dpbmRvd19mb3IoY29uc3QgUVdpZGdldCog dyk7Ci0jZW5kaWYKIFFUX0VORF9OQU1FU1BBQ0UKICNlbmRpZgogCkluZGV4OiBXZWJLaXQvcXQv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDU2 MjY2KQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5 IEBACisyMDEwLTAzLTE5ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRd IFJlbW92ZSBzdXBwb3J0IGZvciBRdCB2NC40CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zNjM4OQorCisgICAgICAgICogQXBpL3F3ZWJlbGVtZW50LmNw cDoKKyAgICAgICAgKFFXZWJFbGVtZW50OjpjbGFzc2VzKToKKyAgICAgICAgKiBBcGkvcXdlYnBh Z2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2VQcml2YXRlOjplZGl0b3JBY3Rpb25Gb3JLZXlFdmVu dCk6CisgICAgICAgIChRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKToKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3JD bGllbnRRdDo6aGFuZGxlS2V5Ym9hcmRFdmVudCk6CisgICAgICAgICogdGVzdHMvdGVzdHMucHJv OgorCiAyMDEwLTAzLTE5ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2ViZWxlbWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2ViZWxlbWVudC5jcHAJKHJldmlz aW9uIDU2MjU1KQorKysgV2ViS2l0L3F0L0FwaS9xd2ViZWxlbWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTg2NCwyNSArODY0LDcgQEAgUVN0cmluZ0xpc3QgUVdlYkVsZW1lbnQ6OmNsYXNzZXMo KSBjb25zdAogICAgICAgICByZXR1cm4gUVN0cmluZ0xpc3QoKTsKIAogICAgIFFTdHJpbmdMaXN0 IGNsYXNzZXMgPSAgYXR0cmlidXRlKFFMYXRpbjFTdHJpbmcoImNsYXNzIikpLnNpbXBsaWZpZWQo KS5zcGxpdChRTGF0aW4xQ2hhcignICcpLCBRU3RyaW5nOjpTa2lwRW1wdHlQYXJ0cyk7Ci0jaWYg UVRfVkVSU0lPTiA+PSAweDA0MDUwMAogICAgIGNsYXNzZXMucmVtb3ZlRHVwbGljYXRlcygpOwot I2Vsc2UKLSAgICBpbnQgbiA9IGNsYXNzZXMuc2l6ZSgpOwotICAgIGludCBqID0gMDsKLSAgICBR U2V0PFFTdHJpbmc+IHNlZW47Ci0gICAgc2Vlbi5yZXNlcnZlKG4pOwotICAgIGZvciAoaW50IGkg PSAwOyBpIDwgbjsgKytpKSB7Ci0gICAgICAgIGNvbnN0IFFTdHJpbmcmIHMgPSBjbGFzc2VzLmF0 KGkpOwotICAgICAgICBpZiAoc2Vlbi5jb250YWlucyhzKSkKLSAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICBzZWVuLmluc2VydChzKTsKLSAgICAgICAgaWYgKGogIT0gaSkKLSAgICAgICAg ICAgIGNsYXNzZXNbal0gPSBzOwotICAgICAgICArK2o7Ci0gICAgfQotICAgIGlmIChuICE9IGop Ci0gICAgICAgIGNsYXNzZXMuZXJhc2UoY2xhc3Nlcy5iZWdpbigpICsgaiwgY2xhc3Nlcy5lbmQo KSk7Ci0jZW5kaWYKICAgICByZXR1cm4gY2xhc3NlczsKIH0KIApJbmRleDogV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJ KHJldmlzaW9uIDU2MjU1KQorKysgV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEwNTUsMTAgKzEwNTUsOCBAQCBRV2ViUGFnZTo6V2ViQWN0aW9uIFFXZWJQYWdl UHJpdmF0ZTo6ZWRpCiAgICAgICAgIHsgUUtleVNlcXVlbmNlOjpTZWxlY3RFbmRPZkRvY3VtZW50 LCBRV2ViUGFnZTo6U2VsZWN0RW5kT2ZEb2N1bWVudCB9LAogICAgICAgICB7IFFLZXlTZXF1ZW5j ZTo6RGVsZXRlU3RhcnRPZldvcmQsIFFXZWJQYWdlOjpEZWxldGVTdGFydE9mV29yZCB9LAogICAg ICAgICB7IFFLZXlTZXF1ZW5jZTo6RGVsZXRlRW5kT2ZXb3JkLCBRV2ViUGFnZTo6RGVsZXRlRW5k T2ZXb3JkIH0sCi0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDUwMAogICAgICAgICB7IFFLZXlTZXF1 ZW5jZTo6SW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yLCBRV2ViUGFnZTo6SW5zZXJ0UGFyYWdyYXBo U2VwYXJhdG9yIH0sCiAgICAgICAgIHsgUUtleVNlcXVlbmNlOjpJbnNlcnRMaW5lU2VwYXJhdG9y LCBRV2ViUGFnZTo6SW5zZXJ0TGluZVNlcGFyYXRvciB9LAotI2VuZGlmCiAgICAgICAgIHsgUUtl eVNlcXVlbmNlOjpTZWxlY3RBbGwsIFFXZWJQYWdlOjpTZWxlY3RBbGwgfSwKICAgICAgICAgeyBR S2V5U2VxdWVuY2U6OlVua25vd25LZXksIFFXZWJQYWdlOjpOb1dlYkFjdGlvbiB9CiAgICAgfTsK SW5kZXg6IFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRRdC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudFF0LmNwcAkocmV2 aXNpb24gNTYyNTUpCisrKyBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50UXQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODQsMTggKzM4NCw2IEBAIHZvaWQgRWRpdG9yQ2xpZW50 UXQ6OmhhbmRsZUtleWJvYXJkRXZlbnQKICAgICAgICAgfSBlbHNlCiAjZW5kaWYgLy8gUVRfTk9f U0hPUlRDVVQKICAgICAgICAgc3dpdGNoIChrZXZlbnQtPndpbmRvd3NWaXJ0dWFsS2V5Q29kZSgp KSB7Ci0jaWYgUVRfVkVSU0lPTiA8IDB4MDQwNTAwCi0gICAgICAgICAgICBjYXNlIFZLX1JFVFVS TjoKLSNpZmRlZiBRVF9XU19NQUMKLSAgICAgICAgICAgICAgICBpZiAoa2V2ZW50LT5zaGlmdEtl eSgpIHx8IGtldmVudC0+bWV0YUtleSgpKQotI2Vsc2UKLSAgICAgICAgICAgICAgICBpZiAoa2V2 ZW50LT5zaGlmdEtleSgpKQotI2VuZGlmCi0gICAgICAgICAgICAgICAgICAgIGZyYW1lLT5lZGl0 b3IoKS0+Y29tbWFuZCgiSW5zZXJ0TGluZUJyZWFrIikuZXhlY3V0ZSgpOwotICAgICAgICAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5jb21tYW5kKCJJ bnNlcnROZXdsaW5lIikuZXhlY3V0ZSgpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotI2VuZGlm CiAgICAgICAgICAgICBjYXNlIFZLX0JBQ0s6CiAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRv cigpLT5kZWxldGVXaXRoRGlyZWN0aW9uKFNlbGVjdGlvbkNvbnRyb2xsZXI6OkJBQ0tXQVJELAog ICAgICAgICAgICAgICAgICAgICAgICAgQ2hhcmFjdGVyR3JhbnVsYXJpdHksIGZhbHNlLCB0cnVl KTsKSW5kZXg6IFdlYktpdC9xdC90ZXN0cy90ZXN0cy5wcm8KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3F0L3Rlc3RzL3Rlc3RzLnBybwkocmV2aXNpb24gNTYyNTUpCisrKyBXZWJLaXQvcXQvdGVzdHMv dGVzdHMucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0xLDQgKzEsNCBAQAogCiBURU1QTEFURSA9IHN1 YmRpcnMKIFNVQkRJUlMgPSBxd2ViZnJhbWUgcXdlYnBhZ2UgcXdlYmVsZW1lbnQgcWdyYXBoaWNz d2VidmlldyBxd2ViaGlzdG9yeWludGVyZmFjZSBxd2VidmlldyBxd2ViaGlzdG9yeSBxd2ViaW5z cGVjdG9yIGh5YnJpZFBpeG1hcAotZ3JlYXRlclRoYW4oUVRfTUlOT1JfVkVSU0lPTiwgNCk6IFNV QkRJUlMgKz0gYmVuY2htYXJrcy9wYWludGluZyBiZW5jaG1hcmtzL2xvYWRpbmcKK1NVQkRJUlMg Kz0gYmVuY2htYXJrcy9wYWludGluZyBiZW5jaG1hcmtzL2xvYWRpbmcKSW5kZXg6IFdlYktpdFRv b2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHJldmlz aW9uIDU2MjY2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTAtMDMtMTkgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NA bm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gUmVtb3ZlIHN1cHBvcnQgZm9yIFF0IHY0LjQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2Mzg5CisKKyAgICAgICAgKiBEdW1wUmVuZGVy VHJlZS9xdC9tYWluLmNwcDoKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIFF0TGF1bmNoZXIv bWFpbndpbmRvdy5jcHA6CisgICAgICAgIChNYWluV2luZG93OjpNYWluV2luZG93KToKKwogMjAx MC0wMy0xOSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2 aWV3ZWQuCkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWluLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWluLmNwcAkocmV2aXNp b24gNTYyNTUpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWluLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTE0LDEwICsxMTQsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciog YXJndltdKQogICAgIFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlOjppbml0aWFsaXplRm9udHMoKTsK ICNlbmRpZgogCi0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDUwMAogICAgIFFBcHBsaWNhdGlvbjo6 c2V0R3JhcGhpY3NTeXN0ZW0oInJhc3RlciIpOwotI2VuZGlmCi0KICAgICBRQXBwbGljYXRpb246 OnNldFN0eWxlKG5ldyBRV2luZG93c1N0eWxlKTsKIAogICAgIFFGb250IGYoIlNhbnMgU2VyaWYi KTsKSW5kZXg6IFdlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbndpbmRvdy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWlud2luZG93LmNwcAkocmV2aXNpb24gNTYy NTUpCisrKyBXZWJLaXRUb29scy9RdExhdW5jaGVyL21haW53aW5kb3cuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zOSwxMCArMzksOCBAQCBNYWluV2luZG93OjpNYWluV2luZG93KGNvbnN0IFFTdHJp bmcmIHVyCiAgICAgOiBtX3BhZ2UobmV3IFdlYlBhZ2UodGhpcykpCiB7CiAgICAgc2V0QXR0cmli dXRlKFF0OjpXQV9EZWxldGVPbkNsb3NlKTsKLSNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05f Q0hFQ0soNCwgNSwgMCkKICAgICBpZiAocWdldGVudigiUVRMQVVOQ0hFUl9VU0VfQVJHQl9WSVNV QUxTIikudG9JbnQoKSA9PSAxKQogICAgICAgICBzZXRBdHRyaWJ1dGUoUXQ6OldBX1RyYW5zbHVj ZW50QmFja2dyb3VuZCk7Ci0jZW5kaWYKIAogICAgIGJ1aWxkVUkoKTsKIH0K