40918 2010-06-21 08:14:57 -0700 [Qt] QtDeclarative Webview element has a fixed white background 2011-05-09 13:06:15 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P4 Normal --- 1 alan.alpert menard abarth commit-queue eric hausmann kamaji kkszysiu kling max.hong.shen menard ossy s.mathur webkit-ews webkit.review.bot oldest_to_newest 240711 0 alan.alpert 2010-06-21 08:14:57 -0700 It should have a property to set the background color to transparent or another color (although the webkit default of white is fine) Moved from Qt tracker where it was http://bugreports.qt.nokia.com/browse/QTBUG-11591 342382 1 kkszysiu 2011-01-30 15:07:46 -0800 Any progress with that bug? 359341 2 84117 menard 2011-02-28 14:14:06 -0800 Created attachment 84117 Proposed patch to implement the feature. 359346 3 84118 menard 2011-02-28 14:16:47 -0800 Created attachment 84118 With a changelog it's better 359541 4 webkit-ews 2011-02-28 17:35:52 -0800 Attachment 84118 did not build on qt: Build output: http://queues.webkit.org/results/8077215 359808 5 84212 menard 2011-03-01 04:50:14 -0800 Created attachment 84212 Make it build if Qt < 4.7.2 The Q_REVISION feature was added for Qt 4.7.2 359823 6 webkit-ews 2011-03-01 05:14:09 -0800 Attachment 84212 did not build on qt: Build output: http://queues.webkit.org/results/8070699 359833 7 84219 menard 2011-03-01 05:51:58 -0800 Created attachment 84219 The ifdef trick can't work moc can't parse the Q_PROPERTY anyway because moc ignore the ifdef directives. We will just wait a bit to integrate it, but the review is still welcome. 359857 8 webkit-ews 2011-03-01 06:19:09 -0800 Attachment 84219 did not build on qt: Build output: http://queues.webkit.org/results/8074584 360652 9 hausmann 2011-03-02 00:57:45 -0800 (In reply to comment #5) > Created an attachment (id=84212) [details] > Make it build if Qt < 4.7.2 > > The Q_REVISION feature was added for Qt 4.7.2 I think we should keep the trunk building with Qt 4.7.0 and 4.7.1. Moc _does_ respect #ifdefs. It's just that _some_ more complex ones, such as WebKit's #if USE(FOO) it can't, but a simple #if QT_VERSION >= 0x040702 it does support. 360695 10 menard 2011-03-02 03:15:02 -0800 (In reply to comment #9) > (In reply to comment #5) > > Created an attachment (id=84212) [details] [details] > > Make it build if Qt < 4.7.2 > > > > The Q_REVISION feature was added for Qt 4.7.2 > > I think we should keep the trunk building with Qt 4.7.0 and 4.7.1. > > Moc _does_ respect #ifdefs. It's just that _some_ more complex ones, such as WebKit's #if USE(FOO) it can't, but a simple #if QT_VERSION >= 0x040702 it does support. No see : "Make it build if Qt < 4.7.2" patch. Moc fail to parse the Q_PROPERTY and try to parse it even inside the ifdef :(. 361542 11 hausmann 2011-03-03 05:59:41 -0800 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #5) > > > Created an attachment (id=84212) [details] [details] [details] > > > Make it build if Qt < 4.7.2 > > > > > > The Q_REVISION feature was added for Qt 4.7.2 > > > > I think we should keep the trunk building with Qt 4.7.0 and 4.7.1. > > > > Moc _does_ respect #ifdefs. It's just that _some_ more complex ones, such as WebKit's #if USE(FOO) it can't, but a simple #if QT_VERSION >= 0x040702 it does support. > > > No see : "Make it build if Qt < 4.7.2" patch. Moc fail to parse the Q_PROPERTY and try to parse it even inside the ifdef :(. Yes, because the #ifdef looks like this: #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 2) which unfortunately doesn't work with moc as moc doesn't expand macros with function style arguments. However if you write #if QT_VERSION >= 0x040702 then moc will get it right. (high chance :) 361548 12 menard 2011-03-03 06:09:49 -0800 (In reply to comment #11) > (In reply to comment #10) > > (In reply to comment #9) > > > (In reply to comment #5) > > > > Created an attachment (id=84212) [details] [details] [details] [details] > > > > Make it build if Qt < 4.7.2 > > > > > > > > The Q_REVISION feature was added for Qt 4.7.2 > > > > > > I think we should keep the trunk building with Qt 4.7.0 and 4.7.1. > > > > > > Moc _does_ respect #ifdefs. It's just that _some_ more complex ones, such as WebKit's #if USE(FOO) it can't, but a simple #if QT_VERSION >= 0x040702 it does support. > > > > > > No see : "Make it build if Qt < 4.7.2" patch. Moc fail to parse the Q_PROPERTY and try to parse it even inside the ifdef :(. > > Yes, because the #ifdef looks like this: > > #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 2) > > which unfortunately doesn't work with moc as moc doesn't expand macros with > function style arguments. > > However if you write > > #if QT_VERSION >= 0x040702 > > then moc will get it right. (high chance :) On my way to try :) 361559 13 84551 menard 2011-03-03 06:23:20 -0800 Created attachment 84551 #if QT_VERSION >= 0x040702 try. Let see with that one. 365104 14 84551 kling 2011-03-10 04:51:26 -0800 Comment on attachment 84551 #if QT_VERSION >= 0x040702 try. LGTM. 365587 15 84551 commit-queue 2011-03-10 15:36:45 -0800 Comment on attachment 84551 #if QT_VERSION >= 0x040702 try. Clearing flags on attachment: 84551 Committed r80774: <http://trac.webkit.org/changeset/80774> 365588 16 commit-queue 2011-03-10 15:36:51 -0800 All reviewed patches have been landed. Closing bug. 391913 17 s.mathur 2011-04-25 15:03:38 -0700 Now that Qt SDK 1.1 RC with 4.7.3 is out, the code guarded with QT_VERSION >= 0x040703 (in http://trac.webkit.org/changeset/80781) doesn't compile. Q_REVISION() for example, doesn't appear in qobjectdefs.h until 4.7.4. Therefore, attaching a patch which bumps up the version check requirement to 4.7.4. This is busting the public Symbian buildbot if we upgrade the Qt SDK to latest RC with 4.7.3. 391914 18 90952 s.mathur 2011-04-25 15:04:33 -0700 Created attachment 90952 fix Qt SDK 4.7.3 build bust due to Q_REVISION being undefined 391916 19 webkit.review.bot 2011-04-25 15:07:02 -0700 Attachment 90952 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/ChangeLog', u'Source/WebK..." exit_code: 1 Source/WebKit/qt/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 391917 20 90953 s.mathur 2011-04-25 15:07:04 -0700 Created attachment 90953 fix indent in Changelog 392425 21 max.hong.shen 2011-04-26 06:59:52 -0700 Commit Siddharth's change which is a build fix. 392489 22 90953 kling 2011-04-26 08:37:03 -0700 Comment on attachment 90953 fix indent in Changelog View in context: https://bugs.webkit.org/attachment.cgi?id=90953&action=review Oh this again. Huh. r=me > Source/WebKit/qt/ChangeLog:8 > + Macro Q_REVISION and associated qdeclrativeitem.h signals are not available in 4.7.3 headers in Nokia Qt SDK. Typo, qdeclrativeitem.h 392555 23 max.hong.shen 2011-04-26 10:34:08 -0700 Committed r84928: <http://trac.webkit.org/changeset/84928> 392604 24 webkit.review.bot 2011-04-26 11:49:16 -0700 http://trac.webkit.org/changeset/84928 might have broken SnowLeopard Intel Release (WebKit2 Tests) The following tests are not passing: fast/loader/file-protocol-fragment.html 394984 25 kamaji 2011-04-28 17:39:31 -0700 This may be right for official 4.7.3 Qt builds, but trunk builds of Qt report their version as 4.8.0 -- some trunk builds (qpa) don't have the change that adds REVISION, but report their Qt versionas 4.8.0, and thus die here. I'd like to add a check for Q_REVISION -- if it's present, all this code should work. It's actually more accurate than checking the version number. Attaching patch shortly. 394991 26 91607 kamaji 2011-04-28 17:46:41 -0700 Created attachment 91607 Patch 394995 27 91607 kling 2011-04-28 17:57:54 -0700 Comment on attachment 91607 Patch Just checking if Q_REVISION is defined should be enough. 395044 28 91621 kamaji 2011-04-28 19:32:44 -0700 Created attachment 91621 Patch 395162 29 ossy 2011-04-29 00:43:43 -0700 (In reply to comment #27) > (From update of attachment 91607 [details]) > Just checking if Q_REVISION is defined should be enough. EWS won't work on closed bugs. ;) And it has Qt 4.7.2, because it is tha latest released Qt version now. 395236 30 s.mathur 2011-04-29 06:11:46 -0700 Reopening 397277 31 91621 commit-queue 2011-05-03 12:51:34 -0700 Comment on attachment 91621 Patch Clearing flags on attachment: 91621 Committed r85640: <http://trac.webkit.org/changeset/85640> 84117 2011-02-28 14:14:06 -0800 2011-02-28 14:16:47 -0800 Proposed patch to implement the feature. patch.diff text/plain 6172 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcCBiL1Nv dXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAppbmRleCBmMWYxNjVlLi4zNzRj YWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAK KysrIGIvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCkBAIC0zMiw2ICsz Miw5IEBAIHB1YmxpYzoKICAgICAgICAgUV9BU1NFUlQoUUxhdGluMVN0cmluZyh1cmkpID09IFFM YXRpbjFTdHJpbmcoIlF0V2ViS2l0IikpOwogICAgICAgICBxbWxSZWdpc3RlclR5cGU8UURlY2xh cmF0aXZlV2ViU2V0dGluZ3M+KCk7CiAgICAgICAgIHFtbFJlZ2lzdGVyVHlwZTxRRGVjbGFyYXRp dmVXZWJWaWV3Pih1cmksIDEsIDAsICJXZWJWaWV3Iik7CisgICAgICAgIHFtbFJlZ2lzdGVyVHlw ZTxRRGVjbGFyYXRpdmVXZWJWaWV3Pih1cmksIDEsIDEsICJXZWJWaWV3Iik7CisgICAgICAgIHFt bFJlZ2lzdGVyUmV2aXNpb248UURlY2xhcmF0aXZlV2ViVmlldywgMD4oIlF0V2ViS2l0IiwgMSwg MCk7CisgICAgICAgIHFtbFJlZ2lzdGVyUmV2aXNpb248UURlY2xhcmF0aXZlV2ViVmlldywgMT4o IlF0V2ViS2l0IiwgMSwgMSk7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQv cXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKaW5kZXggOTMxM2Q2Yy4uYTRl YTc0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRp dmV3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJh dGl2ZXdlYnZpZXcuY3BwCkBAIC05ODQsNiArOTg0LDI3IEBAIHZvaWQgUURlY2xhcmF0aXZlV2Vi Vmlldzo6c2V0Q29udGVudHNTY2FsZShxcmVhbCBzY2FsZSkKIH0KIAogLyohCisgICAgXHFtbHBy b3BlcnR5IGNvbG9yIFdlYlZpZXc6OmJhY2tncm91bmRDb2xvcgorICAgIFxzaW5jZSBRdFdlYktp dCAxLjEKKyAgICBUaGlzIHByb3BlcnR5IGhvbGRzIHRoZSBiYWNrZ3JvdW5kIGNvbG9yIG9mIHRo ZSB2aWV3LgorKi8KKworUUNvbG9yIFFEZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRDb2xv cigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGQtPnZpZXctPnBhbGV0dGUoKS5iYXNlKCkuY29sb3Io KTsKK30KKwordm9pZCBRRGVjbGFyYXRpdmVXZWJWaWV3OjpzZXRCYWNrZ3JvdW5kQ29sb3IoY29u c3QgUUNvbG9yJiBjb2xvcikKK3sKKyAgICBRUGFsZXR0ZSBwYWxldHRlID0gZC0+dmlldy0+cGFs ZXR0ZSgpOworICAgIGlmIChwYWxldHRlLmJhc2UoKS5jb2xvcigpID09IGNvbG9yKQorICAgICAg ICByZXR1cm47CisgICAgcGFsZXR0ZS5zZXRCcnVzaChRUGFsZXR0ZTo6QmFzZSwgY29sb3IpOwor ICAgIGQtPnZpZXctPnNldFBhbGV0dGUocGFsZXR0ZSk7CisgICAgZW1pdCBiYWNrZ3JvdW5kQ29s b3JDaGFuZ2VkKCk7Cit9CisKKy8qIQogICAgIFJldHVybnMgdGhlIGFyZWEgb2YgdGhlIGxhcmdl c3QgZWxlbWVudCBhdCBwb3NpdGlvbiAoXGEgeCxcYSB5KSB0aGF0IGlzIG5vIGxhcmdlcgogICAg IHRoYW4gXGEgbWF4V2lkdGggYnkgXGEgbWF4SGVpZ2h0IHBpeGVscy4KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaCBiL1Nv dXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmgKaW5kZXgg Y2ExNWExZS4uYjMxYWEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2 ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0 aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oCkBAIC0xMjMsNiArMTIzLDcgQEAgY2xhc3MgUURl Y2xhcmF0aXZlV2ViVmlldyA6IHB1YmxpYyBRRGVjbGFyYXRpdmVJdGVtIHsKIAogICAgIFFfUFJP UEVSVFkoUVNpemUgY29udGVudHNTaXplIFJFQUQgY29udGVudHNTaXplIE5PVElGWSBjb250ZW50 c1NpemVDaGFuZ2VkKQogICAgIFFfUFJPUEVSVFkocXJlYWwgY29udGVudHNTY2FsZSBSRUFEIGNv bnRlbnRzU2NhbGUgV1JJVEUgc2V0Q29udGVudHNTY2FsZSBOT1RJRlkgY29udGVudHNTY2FsZUNo YW5nZWQpCisgICAgUV9QUk9QRVJUWShRQ29sb3IgYmFja2dyb3VuZENvbG9yIFJFQUQgYmFja2dy b3VuZENvbG9yIFdSSVRFIHNldEJhY2tncm91bmRDb2xvciBOT1RJRlkgYmFja2dyb3VuZENvbG9y Q2hhbmdlZCBSRVZJU0lPTiAxKQogCiBwdWJsaWM6CiAgICAgUURlY2xhcmF0aXZlV2ViVmlldyhR RGVjbGFyYXRpdmVJdGVtICpwYXJlbnQgPSAwKTsKQEAgLTE5Myw2ICsxOTQsOSBAQCBwdWJsaWM6 CiAgICAgdm9pZCBzZXRDb250ZW50c1NjYWxlKHFyZWFsIHNjYWxlKTsKICAgICBxcmVhbCBjb250 ZW50c1NjYWxlKCkgY29uc3Q7CiAKKyAgICBRX1JFVklTSU9OKDEpIFFDb2xvciBiYWNrZ3JvdW5k Q29sb3IoKSBjb25zdDsKKyAgICBRX1JFVklTSU9OKDEpIHZvaWQgc2V0QmFja2dyb3VuZENvbG9y KGNvbnN0IFFDb2xvciYpOworCiBRX1NJR05BTFM6CiAgICAgdm9pZCBwcmVmZXJyZWRXaWR0aENo YW5nZWQoKTsKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodENoYW5nZWQoKTsKQEAgLTIwOSw2ICsy MTMsNyBAQCBRX1NJR05BTFM6CiAgICAgdm9pZCByZW5kZXJpbmdFbmFibGVkQ2hhbmdlZCgpOwog ICAgIHZvaWQgY29udGVudHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYpOwogICAgIHZvaWQgY29u dGVudHNTY2FsZUNoYW5nZWQoKTsKKyAgICB2b2lkIGJhY2tncm91bmRDb2xvckNoYW5nZWQoKTsK IAogICAgIHZvaWQgbG9hZFN0YXJ0ZWQoKTsKICAgICB2b2lkIGxvYWRGaW5pc2hlZCgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3Jlc291 cmNlcy93ZWJ2aWV3YmFja2dyb3VuZGNvbG9yLnFtbCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cWRlY2xhcmF0aXZld2Vidmlldy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91bmRjb2xvci5xbWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmVkYzc5NAotLS0gL2Rldi9udWxs CisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy9yZXNvdXJj ZXMvd2Vidmlld2JhY2tncm91bmRjb2xvci5xbWwKQEAgLTAsMCArMSwxMCBAQAoraW1wb3J0IFF0 IDQuNworaW1wb3J0IFF0V2ViS2l0IDEuMQorCitXZWJWaWV3IHsKKyAgICBpZDogbXl3ZWIKKyAg ICBoZWlnaHQ6IDMwMAorICAgIHdpZHRoOiAzMDAKKyAgICBmb2N1czogdHJ1ZQorICAgIGJhY2tn cm91bmRDb2xvciA6ICJyZWQiCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3Rz L3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwIGIvU291cmNl L1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2 aWV3LmNwcAppbmRleCAwMDI1ZDZjLi4zMTkxZDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRl Y2xhcmF0aXZld2Vidmlldy5jcHAKQEAgLTEsNCArMSw1IEBACiAjaW5jbHVkZSAiLi4vdXRpbC5o IgorI2luY2x1ZGUgPFFDb2xvcj4KICNpbmNsdWRlIDxRRGVidWc+CiAjaW5jbHVkZSA8UURlY2xh cmF0aXZlQ29tcG9uZW50PgogI2luY2x1ZGUgPFFEZWNsYXJhdGl2ZUVuZ2luZT4KQEAgLTIyLDYg KzIzLDcgQEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodFRlc3QoKTsK ICAgICB2b2lkIHByZWZlcnJlZFdpZHRoRGVmYXVsdFRlc3QoKTsKICAgICB2b2lkIHByZWZlcnJl ZEhlaWdodERlZmF1bHRUZXN0KCk7CisgICAgdm9pZCBiYWNrZ3JvdW5kQ29sb3IoKTsKIAogcHJp dmF0ZToKICAgICB2b2lkIGNoZWNrTm9FcnJvcnMoY29uc3QgUURlY2xhcmF0aXZlQ29tcG9uZW50 Jik7CkBAIC04Miw2ICs4NCwzNCBAQCB2b2lkIHRzdF9RRGVjbGFyYXRpdmVXZWJWaWV3OjpwcmVm ZXJyZWRIZWlnaHREZWZhdWx0VGVzdCgpCiAgICAgUUNPTVBBUkUod3YtPnByb3BlcnR5KCJwcmVm SGVpZ2h0IikudG9Eb3VibGUoKSwgdmlldy5wcmVmZXJyZWRIZWlnaHQoKSk7CiB9CiAKK3ZvaWQg dHN0X1FEZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRDb2xvcigpCit7CisgICAgLy8gV2Ug dGVzdCBoZXJlIHRoZSByZW5kZXJpbmcgb2YgdGhlIGJhY2tncm91bmQuCisgICAgUURlY2xhcmF0 aXZlRW5naW5lIGVuZ2luZTsKKyAgICBRRGVjbGFyYXRpdmVDb21wb25lbnQgY29tcG9uZW50KCZl bmdpbmUsIFFVcmwoInFyYzovLy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91bmRjb2xvci5xbWwi KSk7CisgICAgY2hlY2tOb0Vycm9ycyhjb21wb25lbnQpOworICAgIFFPYmplY3QqIHd2ID0gY29t cG9uZW50LmNyZWF0ZSgpOworICAgIFFWRVJJRlkod3YpOworICAgIFFDT01QQVJFKHd2LT5wcm9w ZXJ0eSgiYmFja2dyb3VuZENvbG9yIikudmFsdWU8UUNvbG9yPigpLCBRQ29sb3IoUXQ6OnJlZCkp OworICAgIFFEZWNsYXJhdGl2ZVZpZXcgdmlldzsKKyAgICB2aWV3LnNldFNvdXJjZShRVXJsKCJx cmM6Ly8vcmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sIikpOworICAgIHZpZXcu c2hvdygpOworICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd1Nob3duKCZ2aWV3KTsKKyAgICBRUGl4 bWFwIHJlc3VsdCh2aWV3LndpZHRoKCksIHZpZXcuaGVpZ2h0KCkpOworICAgIFFQYWludGVyIHBh aW50ZXIoJnJlc3VsdCk7CisgICAgdmlldy5yZW5kZXIoJnBhaW50ZXIpOworICAgIFFQaXhtYXAg cmVmZXJlbmNlKHZpZXcud2lkdGgoKSwgdmlldy5oZWlnaHQoKSk7CisgICAgcmVmZXJlbmNlLmZp bGwoUXQ6OnJlZCk7CisgICAgUUNPTVBBUkUocmVmZXJlbmNlLCByZXN1bHQpOworCisgICAgLy8g V2UgdGVzdCB0aGUgZW1pc3Npb24gb2YgdGhlIGJhY2tncm91bmRDb2xvckNoYW5nZWQgc2lnbmFs LgorICAgIFFTaWduYWxTcHkgc3B5Q29sb3JDaGFuZ2VkKHd2LCBTSUdOQUwoYmFja2dyb3VuZENv bG9yQ2hhbmdlZCgpKSk7CisgICAgd3YtPnNldFByb3BlcnR5KCJiYWNrZ3JvdW5kQ29sb3IiLCBR dDo6cmVkKTsKKyAgICBRQ09NUEFSRShzcHlDb2xvckNoYW5nZWQuY291bnQoKSwgMCk7CisgICAg d3YtPnNldFByb3BlcnR5KCJiYWNrZ3JvdW5kQ29sb3IiLCBRdDo6Z3JlZW4pOworICAgIFFDT01Q QVJFKHNweUNvbG9yQ2hhbmdlZC5jb3VudCgpLCAxKTsKK30KKwogdm9pZCB0c3RfUURlY2xhcmF0 aXZlV2ViVmlldzo6Y2hlY2tOb0Vycm9ycyhjb25zdCBRRGVjbGFyYXRpdmVDb21wb25lbnQmIGNv bXBvbmVudCkKIHsKICAgICAvLyBXYWl0IHVudGlsIHRoZSBjb21wb25lbnQgaXMgcmVhZHkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3Rf cWRlY2xhcmF0aXZld2Vidmlldy5xcmMgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJh dGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcucXJjCmluZGV4IDljMjc0MDkuLmUx NGMzMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vi dmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5xcmMKKysrIGIvU291cmNlL1dlYktpdC9xdC90 ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LnFyYwpAQCAt Myw1ICszLDYgQEAKICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3dlYnZpZXd0ZXN0ZGVmYXVsdC5x bWw8L2ZpbGU+CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy93ZWJ2aWV3dGVzdC5xbWw8L2ZpbGU+ CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy9zYW1wbGUuaHRtbDwvZmlsZT4KKyAgICAgICAgPGZp bGU+cmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sPC9maWxlPgogICAgIDwvcXJl c291cmNlPgogPC9SQ0M+Cg== 84118 2011-02-28 14:16:47 -0800 2011-03-01 04:50:14 -0800 With a changelog it's better patch.diff text/plain 7477 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggZWQxZDcyOC4uODM1MzUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNiBAQAogMjAxMS0wMi0yOCAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3Bl bmJvc3NhLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIFF0RGVjbGFyYXRpdmUgV2VidmlldyBlbGVtZW50IGhhcyBhIGZpeGVkIHdoaXRl IGJhY2tncm91bmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQwOTE4CisKKyAgICAgICAgSW1wbGVtZW50IGEgd2F5IHRvIGNoYW5nZSB0aGUgYmFja2dy b3VuZCBjb2xvciBvZiB0aGUgV2ViVmlldyBRTUwgZWxlbWVudC4KKyAgICAgICAgVGhpcyBmZWF0 dXJlIGlzIGFjdGl2YXRlZCBmb3IgUXRXZWJLaXQgMS4xIHZlcnNpb24gb2YgdGhlIHBsdWdpbi4K K2AKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9wbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0UW1s UGx1Z2luOjpyZWdpc3RlclR5cGVzKToKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9xZGVjbGFyYXRp dmV3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFEZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRD b2xvcik6CisgICAgICAgIChRRGVjbGFyYXRpdmVXZWJWaWV3OjpzZXRCYWNrZ3JvdW5kQ29sb3Ip OgorICAgICAgICAqIGRlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oOgorICAgICAg ICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvcmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5k Y29sb3IucW1sOiBBZGRlZC4KKyAgICAgICAgKiB0ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3Rz dF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHRzdF9RRGVjbGFyYXRpdmVXZWJW aWV3OjpiYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZp ZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcucXJjOgorCisyMDExLTAyLTI4ICBBbGV4aXMgTWVu YXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IE9saXZlciBIdW50LgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgUXQgcG9ydCBhZnRlciBBUEkg Y2hhbmdlcyBvZiBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC83OTkwNC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAppbmRleCBmMWYxNjVlLi4zNzRjYWJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAKKysrIGIv U291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCkBAIC0zMiw2ICszMiw5IEBA IHB1YmxpYzoKICAgICAgICAgUV9BU1NFUlQoUUxhdGluMVN0cmluZyh1cmkpID09IFFMYXRpbjFT dHJpbmcoIlF0V2ViS2l0IikpOwogICAgICAgICBxbWxSZWdpc3RlclR5cGU8UURlY2xhcmF0aXZl V2ViU2V0dGluZ3M+KCk7CiAgICAgICAgIHFtbFJlZ2lzdGVyVHlwZTxRRGVjbGFyYXRpdmVXZWJW aWV3Pih1cmksIDEsIDAsICJXZWJWaWV3Iik7CisgICAgICAgIHFtbFJlZ2lzdGVyVHlwZTxRRGVj bGFyYXRpdmVXZWJWaWV3Pih1cmksIDEsIDEsICJXZWJWaWV3Iik7CisgICAgICAgIHFtbFJlZ2lz dGVyUmV2aXNpb248UURlY2xhcmF0aXZlV2ViVmlldywgMD4oIlF0V2ViS2l0IiwgMSwgMCk7Cisg ICAgICAgIHFtbFJlZ2lzdGVyUmV2aXNpb248UURlY2xhcmF0aXZlV2ViVmlldywgMT4oIlF0V2Vi S2l0IiwgMSwgMSk7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9k ZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvZGVj bGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKaW5kZXggOTMxM2Q2Yy4uYTRlYTc0NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdl YnZpZXcuY3BwCkBAIC05ODQsNiArOTg0LDI3IEBAIHZvaWQgUURlY2xhcmF0aXZlV2ViVmlldzo6 c2V0Q29udGVudHNTY2FsZShxcmVhbCBzY2FsZSkKIH0KIAogLyohCisgICAgXHFtbHByb3BlcnR5 IGNvbG9yIFdlYlZpZXc6OmJhY2tncm91bmRDb2xvcgorICAgIFxzaW5jZSBRdFdlYktpdCAxLjEK KyAgICBUaGlzIHByb3BlcnR5IGhvbGRzIHRoZSBiYWNrZ3JvdW5kIGNvbG9yIG9mIHRoZSB2aWV3 LgorKi8KKworUUNvbG9yIFFEZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRDb2xvcigpIGNv bnN0Cit7CisgICAgcmV0dXJuIGQtPnZpZXctPnBhbGV0dGUoKS5iYXNlKCkuY29sb3IoKTsKK30K Kwordm9pZCBRRGVjbGFyYXRpdmVXZWJWaWV3OjpzZXRCYWNrZ3JvdW5kQ29sb3IoY29uc3QgUUNv bG9yJiBjb2xvcikKK3sKKyAgICBRUGFsZXR0ZSBwYWxldHRlID0gZC0+dmlldy0+cGFsZXR0ZSgp OworICAgIGlmIChwYWxldHRlLmJhc2UoKS5jb2xvcigpID09IGNvbG9yKQorICAgICAgICByZXR1 cm47CisgICAgcGFsZXR0ZS5zZXRCcnVzaChRUGFsZXR0ZTo6QmFzZSwgY29sb3IpOworICAgIGQt PnZpZXctPnNldFBhbGV0dGUocGFsZXR0ZSk7CisgICAgZW1pdCBiYWNrZ3JvdW5kQ29sb3JDaGFu Z2VkKCk7Cit9CisKKy8qIQogICAgIFJldHVybnMgdGhlIGFyZWEgb2YgdGhlIGxhcmdlc3QgZWxl bWVudCBhdCBwb3NpdGlvbiAoXGEgeCxcYSB5KSB0aGF0IGlzIG5vIGxhcmdlcgogICAgIHRoYW4g XGEgbWF4V2lkdGggYnkgXGEgbWF4SGVpZ2h0IHBpeGVscy4KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaCBiL1NvdXJjZS9X ZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmgKaW5kZXggY2ExNWEx ZS4uYjMxYWEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVj bGFyYXRpdmV3ZWJ2aWV3X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3Fk ZWNsYXJhdGl2ZXdlYnZpZXdfcC5oCkBAIC0xMjMsNiArMTIzLDcgQEAgY2xhc3MgUURlY2xhcmF0 aXZlV2ViVmlldyA6IHB1YmxpYyBRRGVjbGFyYXRpdmVJdGVtIHsKIAogICAgIFFfUFJPUEVSVFko UVNpemUgY29udGVudHNTaXplIFJFQUQgY29udGVudHNTaXplIE5PVElGWSBjb250ZW50c1NpemVD aGFuZ2VkKQogICAgIFFfUFJPUEVSVFkocXJlYWwgY29udGVudHNTY2FsZSBSRUFEIGNvbnRlbnRz U2NhbGUgV1JJVEUgc2V0Q29udGVudHNTY2FsZSBOT1RJRlkgY29udGVudHNTY2FsZUNoYW5nZWQp CisgICAgUV9QUk9QRVJUWShRQ29sb3IgYmFja2dyb3VuZENvbG9yIFJFQUQgYmFja2dyb3VuZENv bG9yIFdSSVRFIHNldEJhY2tncm91bmRDb2xvciBOT1RJRlkgYmFja2dyb3VuZENvbG9yQ2hhbmdl ZCBSRVZJU0lPTiAxKQogCiBwdWJsaWM6CiAgICAgUURlY2xhcmF0aXZlV2ViVmlldyhRRGVjbGFy YXRpdmVJdGVtICpwYXJlbnQgPSAwKTsKQEAgLTE5Myw2ICsxOTQsOSBAQCBwdWJsaWM6CiAgICAg dm9pZCBzZXRDb250ZW50c1NjYWxlKHFyZWFsIHNjYWxlKTsKICAgICBxcmVhbCBjb250ZW50c1Nj YWxlKCkgY29uc3Q7CiAKKyAgICBRX1JFVklTSU9OKDEpIFFDb2xvciBiYWNrZ3JvdW5kQ29sb3Io KSBjb25zdDsKKyAgICBRX1JFVklTSU9OKDEpIHZvaWQgc2V0QmFja2dyb3VuZENvbG9yKGNvbnN0 IFFDb2xvciYpOworCiBRX1NJR05BTFM6CiAgICAgdm9pZCBwcmVmZXJyZWRXaWR0aENoYW5nZWQo KTsKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodENoYW5nZWQoKTsKQEAgLTIwOSw2ICsyMTMsNyBA QCBRX1NJR05BTFM6CiAgICAgdm9pZCByZW5kZXJpbmdFbmFibGVkQ2hhbmdlZCgpOwogICAgIHZv aWQgY29udGVudHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYpOwogICAgIHZvaWQgY29udGVudHNT Y2FsZUNoYW5nZWQoKTsKKyAgICB2b2lkIGJhY2tncm91bmRDb2xvckNoYW5nZWQoKTsKIAogICAg IHZvaWQgbG9hZFN0YXJ0ZWQoKTsKICAgICB2b2lkIGxvYWRGaW5pc2hlZCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3Jlc291cmNlcy93 ZWJ2aWV3YmFja2dyb3VuZGNvbG9yLnFtbCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xh cmF0aXZld2Vidmlldy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91bmRjb2xvci5xbWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmVkYzc5NAotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy9yZXNvdXJjZXMvd2Vi dmlld2JhY2tncm91bmRjb2xvci5xbWwKQEAgLTAsMCArMSwxMCBAQAoraW1wb3J0IFF0IDQuNwor aW1wb3J0IFF0V2ViS2l0IDEuMQorCitXZWJWaWV3IHsKKyAgICBpZDogbXl3ZWIKKyAgICBoZWln aHQ6IDMwMAorICAgIHdpZHRoOiAzMDAKKyAgICBmb2N1czogdHJ1ZQorICAgIGJhY2tncm91bmRD b2xvciA6ICJyZWQiCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNs YXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktp dC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNw cAppbmRleCAwMDI1ZDZjLi4zMTkxZDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rl c3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xhcmF0 aXZld2Vidmlldy5jcHAKQEAgLTEsNCArMSw1IEBACiAjaW5jbHVkZSAiLi4vdXRpbC5oIgorI2lu Y2x1ZGUgPFFDb2xvcj4KICNpbmNsdWRlIDxRRGVidWc+CiAjaW5jbHVkZSA8UURlY2xhcmF0aXZl Q29tcG9uZW50PgogI2luY2x1ZGUgPFFEZWNsYXJhdGl2ZUVuZ2luZT4KQEAgLTIyLDYgKzIzLDcg QEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodFRlc3QoKTsKICAgICB2 b2lkIHByZWZlcnJlZFdpZHRoRGVmYXVsdFRlc3QoKTsKICAgICB2b2lkIHByZWZlcnJlZEhlaWdo dERlZmF1bHRUZXN0KCk7CisgICAgdm9pZCBiYWNrZ3JvdW5kQ29sb3IoKTsKIAogcHJpdmF0ZToK ICAgICB2b2lkIGNoZWNrTm9FcnJvcnMoY29uc3QgUURlY2xhcmF0aXZlQ29tcG9uZW50Jik7CkBA IC04Miw2ICs4NCwzNCBAQCB2b2lkIHRzdF9RRGVjbGFyYXRpdmVXZWJWaWV3OjpwcmVmZXJyZWRI ZWlnaHREZWZhdWx0VGVzdCgpCiAgICAgUUNPTVBBUkUod3YtPnByb3BlcnR5KCJwcmVmSGVpZ2h0 IikudG9Eb3VibGUoKSwgdmlldy5wcmVmZXJyZWRIZWlnaHQoKSk7CiB9CiAKK3ZvaWQgdHN0X1FE ZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRDb2xvcigpCit7CisgICAgLy8gV2UgdGVzdCBo ZXJlIHRoZSByZW5kZXJpbmcgb2YgdGhlIGJhY2tncm91bmQuCisgICAgUURlY2xhcmF0aXZlRW5n aW5lIGVuZ2luZTsKKyAgICBRRGVjbGFyYXRpdmVDb21wb25lbnQgY29tcG9uZW50KCZlbmdpbmUs IFFVcmwoInFyYzovLy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91bmRjb2xvci5xbWwiKSk7Cisg ICAgY2hlY2tOb0Vycm9ycyhjb21wb25lbnQpOworICAgIFFPYmplY3QqIHd2ID0gY29tcG9uZW50 LmNyZWF0ZSgpOworICAgIFFWRVJJRlkod3YpOworICAgIFFDT01QQVJFKHd2LT5wcm9wZXJ0eSgi YmFja2dyb3VuZENvbG9yIikudmFsdWU8UUNvbG9yPigpLCBRQ29sb3IoUXQ6OnJlZCkpOworICAg IFFEZWNsYXJhdGl2ZVZpZXcgdmlldzsKKyAgICB2aWV3LnNldFNvdXJjZShRVXJsKCJxcmM6Ly8v cmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sIikpOworICAgIHZpZXcuc2hvdygp OworICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd1Nob3duKCZ2aWV3KTsKKyAgICBRUGl4bWFwIHJl c3VsdCh2aWV3LndpZHRoKCksIHZpZXcuaGVpZ2h0KCkpOworICAgIFFQYWludGVyIHBhaW50ZXIo JnJlc3VsdCk7CisgICAgdmlldy5yZW5kZXIoJnBhaW50ZXIpOworICAgIFFQaXhtYXAgcmVmZXJl bmNlKHZpZXcud2lkdGgoKSwgdmlldy5oZWlnaHQoKSk7CisgICAgcmVmZXJlbmNlLmZpbGwoUXQ6 OnJlZCk7CisgICAgUUNPTVBBUkUocmVmZXJlbmNlLCByZXN1bHQpOworCisgICAgLy8gV2UgdGVz dCB0aGUgZW1pc3Npb24gb2YgdGhlIGJhY2tncm91bmRDb2xvckNoYW5nZWQgc2lnbmFsLgorICAg IFFTaWduYWxTcHkgc3B5Q29sb3JDaGFuZ2VkKHd2LCBTSUdOQUwoYmFja2dyb3VuZENvbG9yQ2hh bmdlZCgpKSk7CisgICAgd3YtPnNldFByb3BlcnR5KCJiYWNrZ3JvdW5kQ29sb3IiLCBRdDo6cmVk KTsKKyAgICBRQ09NUEFSRShzcHlDb2xvckNoYW5nZWQuY291bnQoKSwgMCk7CisgICAgd3YtPnNl dFByb3BlcnR5KCJiYWNrZ3JvdW5kQ29sb3IiLCBRdDo6Z3JlZW4pOworICAgIFFDT01QQVJFKHNw eUNvbG9yQ2hhbmdlZC5jb3VudCgpLCAxKTsKK30KKwogdm9pZCB0c3RfUURlY2xhcmF0aXZlV2Vi Vmlldzo6Y2hlY2tOb0Vycm9ycyhjb25zdCBRRGVjbGFyYXRpdmVDb21wb25lbnQmIGNvbXBvbmVu dCkKIHsKICAgICAvLyBXYWl0IHVudGlsIHRoZSBjb21wb25lbnQgaXMgcmVhZHkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xh cmF0aXZld2Vidmlldy5xcmMgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJhdGl2ZXdl YnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcucXJjCmluZGV4IDljMjc0MDkuLmUxNGMzMzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90 c3RfcWRlY2xhcmF0aXZld2Vidmlldy5xcmMKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x ZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LnFyYwpAQCAtMyw1ICsz LDYgQEAKICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3dlYnZpZXd0ZXN0ZGVmYXVsdC5xbWw8L2Zp bGU+CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy93ZWJ2aWV3dGVzdC5xbWw8L2ZpbGU+CiAgICAg ICAgIDxmaWxlPnJlc291cmNlcy9zYW1wbGUuaHRtbDwvZmlsZT4KKyAgICAgICAgPGZpbGU+cmVz b3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sPC9maWxlPgogICAgIDwvcXJlc291cmNl PgogPC9SQ0M+Cg== 84212 2011-03-01 04:50:14 -0800 2011-03-01 05:51:58 -0800 Make it build if Qt < 4.7.2 patch.diff text/plain 7882 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggZWQxZDcyOC4uODM1MzUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNiBAQAogMjAxMS0wMi0yOCAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3Bl bmJvc3NhLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIFF0RGVjbGFyYXRpdmUgV2VidmlldyBlbGVtZW50IGhhcyBhIGZpeGVkIHdoaXRl IGJhY2tncm91bmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQwOTE4CisKKyAgICAgICAgSW1wbGVtZW50IGEgd2F5IHRvIGNoYW5nZSB0aGUgYmFja2dy b3VuZCBjb2xvciBvZiB0aGUgV2ViVmlldyBRTUwgZWxlbWVudC4KKyAgICAgICAgVGhpcyBmZWF0 dXJlIGlzIGFjdGl2YXRlZCBmb3IgUXRXZWJLaXQgMS4xIHZlcnNpb24gb2YgdGhlIHBsdWdpbi4K K2AKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9wbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0UW1s UGx1Z2luOjpyZWdpc3RlclR5cGVzKToKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9xZGVjbGFyYXRp dmV3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFEZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRD b2xvcik6CisgICAgICAgIChRRGVjbGFyYXRpdmVXZWJWaWV3OjpzZXRCYWNrZ3JvdW5kQ29sb3Ip OgorICAgICAgICAqIGRlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oOgorICAgICAg ICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvcmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5k Y29sb3IucW1sOiBBZGRlZC4KKyAgICAgICAgKiB0ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3Rz dF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHRzdF9RRGVjbGFyYXRpdmVXZWJW aWV3OjpiYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZp ZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcucXJjOgorCisyMDExLTAyLTI4ICBBbGV4aXMgTWVu YXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IE9saXZlciBIdW50LgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgUXQgcG9ydCBhZnRlciBBUEkg Y2hhbmdlcyBvZiBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC83OTkwNC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAppbmRleCBmMWYxNjVlLi4zYjEyOGY2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAKKysrIGIv U291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCkBAIC0zMiw2ICszMiwxMSBA QCBwdWJsaWM6CiAgICAgICAgIFFfQVNTRVJUKFFMYXRpbjFTdHJpbmcodXJpKSA9PSBRTGF0aW4x U3RyaW5nKCJRdFdlYktpdCIpKTsKICAgICAgICAgcW1sUmVnaXN0ZXJUeXBlPFFEZWNsYXJhdGl2 ZVdlYlNldHRpbmdzPigpOwogICAgICAgICBxbWxSZWdpc3RlclR5cGU8UURlY2xhcmF0aXZlV2Vi Vmlldz4odXJpLCAxLCAwLCAiV2ViVmlldyIpOworI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lP Tl9DSEVDSyg0LCA3LCAyKQorICAgICAgICBxbWxSZWdpc3RlclR5cGU8UURlY2xhcmF0aXZlV2Vi Vmlldz4odXJpLCAxLCAxLCAiV2ViVmlldyIpOworICAgICAgICBxbWxSZWdpc3RlclJldmlzaW9u PFFEZWNsYXJhdGl2ZVdlYlZpZXcsIDA+KCJRdFdlYktpdCIsIDEsIDApOworICAgICAgICBxbWxS ZWdpc3RlclJldmlzaW9uPFFEZWNsYXJhdGl2ZVdlYlZpZXcsIDE+KCJRdFdlYktpdCIsIDEsIDEp OworI2VuZGlmCiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9kZWNs YXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFy YXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKaW5kZXggOTMxM2Q2Yy4uMmMyYjRjNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZp ZXcuY3BwCkBAIC05ODMsNiArOTgzLDI5IEBAIHZvaWQgUURlY2xhcmF0aXZlV2ViVmlldzo6c2V0 Q29udGVudHNTY2FsZShxcmVhbCBzY2FsZSkKICAgICBlbWl0IGNvbnRlbnRzU2NhbGVDaGFuZ2Vk KCk7CiB9CiAKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNywgMikKKy8q IQorICAgIFxxbWxwcm9wZXJ0eSBjb2xvciBXZWJWaWV3OjpiYWNrZ3JvdW5kQ29sb3IKKyAgICBc c2luY2UgUXRXZWJLaXQgMS4xCisgICAgVGhpcyBwcm9wZXJ0eSBob2xkcyB0aGUgYmFja2dyb3Vu ZCBjb2xvciBvZiB0aGUgdmlldy4KKyovCisKK1FDb2xvciBRRGVjbGFyYXRpdmVXZWJWaWV3Ojpi YWNrZ3JvdW5kQ29sb3IoKSBjb25zdAoreworICAgIHJldHVybiBkLT52aWV3LT5wYWxldHRlKCku YmFzZSgpLmNvbG9yKCk7Cit9CisKK3ZvaWQgUURlY2xhcmF0aXZlV2ViVmlldzo6c2V0QmFja2dy b3VuZENvbG9yKGNvbnN0IFFDb2xvciYgY29sb3IpCit7CisgICAgUVBhbGV0dGUgcGFsZXR0ZSA9 IGQtPnZpZXctPnBhbGV0dGUoKTsKKyAgICBpZiAocGFsZXR0ZS5iYXNlKCkuY29sb3IoKSA9PSBj b2xvcikKKyAgICAgICAgcmV0dXJuOworICAgIHBhbGV0dGUuc2V0QnJ1c2goUVBhbGV0dGU6OkJh c2UsIGNvbG9yKTsKKyAgICBkLT52aWV3LT5zZXRQYWxldHRlKHBhbGV0dGUpOworICAgIGVtaXQg YmFja2dyb3VuZENvbG9yQ2hhbmdlZCgpOworfQorI2VuZGlmCisKIC8qIQogICAgIFJldHVybnMg dGhlIGFyZWEgb2YgdGhlIGxhcmdlc3QgZWxlbWVudCBhdCBwb3NpdGlvbiAoXGEgeCxcYSB5KSB0 aGF0IGlzIG5vIGxhcmdlcgogICAgIHRoYW4gXGEgbWF4V2lkdGggYnkgXGEgbWF4SGVpZ2h0IHBp eGVscy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0 aXZld2Vidmlld19wLmggYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2 ZXdlYnZpZXdfcC5oCmluZGV4IGNhMTVhMWUuLmQwYjk0YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmgKKysrIGIvU291cmNl L1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaApAQCAtMTIzLDYg KzEyMyw5IEBAIGNsYXNzIFFEZWNsYXJhdGl2ZVdlYlZpZXcgOiBwdWJsaWMgUURlY2xhcmF0aXZl SXRlbSB7CiAKICAgICBRX1BST1BFUlRZKFFTaXplIGNvbnRlbnRzU2l6ZSBSRUFEIGNvbnRlbnRz U2l6ZSBOT1RJRlkgY29udGVudHNTaXplQ2hhbmdlZCkKICAgICBRX1BST1BFUlRZKHFyZWFsIGNv bnRlbnRzU2NhbGUgUkVBRCBjb250ZW50c1NjYWxlIFdSSVRFIHNldENvbnRlbnRzU2NhbGUgTk9U SUZZIGNvbnRlbnRzU2NhbGVDaGFuZ2VkKQorI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9D SEVDSyg0LCA3LCAyKQorICAgIFFfUFJPUEVSVFkoUUNvbG9yIGJhY2tncm91bmRDb2xvciBSRUFE IGJhY2tncm91bmRDb2xvciBXUklURSBzZXRCYWNrZ3JvdW5kQ29sb3IgTk9USUZZIGJhY2tncm91 bmRDb2xvckNoYW5nZWQgUkVWSVNJT04gMSkKKyNlbmRpZgogCiBwdWJsaWM6CiAgICAgUURlY2xh cmF0aXZlV2ViVmlldyhRRGVjbGFyYXRpdmVJdGVtICpwYXJlbnQgPSAwKTsKQEAgLTE5Myw2ICsx OTYsMTEgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29udGVudHNTY2FsZShxcmVhbCBzY2FsZSk7 CiAgICAgcXJlYWwgY29udGVudHNTY2FsZSgpIGNvbnN0OwogCisjaWYgUVRfVkVSU0lPTiA+PSBR VF9WRVJTSU9OX0NIRUNLKDQsIDcsIDIpCisgICAgUV9SRVZJU0lPTigxKSBRQ29sb3IgYmFja2dy b3VuZENvbG9yKCkgY29uc3Q7CisgICAgUV9SRVZJU0lPTigxKSB2b2lkIHNldEJhY2tncm91bmRD b2xvcihjb25zdCBRQ29sb3ImKTsKKyNlbmRpZgorCiBRX1NJR05BTFM6CiAgICAgdm9pZCBwcmVm ZXJyZWRXaWR0aENoYW5nZWQoKTsKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodENoYW5nZWQoKTsK QEAgLTIwOSw2ICsyMTcsOSBAQCBRX1NJR05BTFM6CiAgICAgdm9pZCByZW5kZXJpbmdFbmFibGVk Q2hhbmdlZCgpOwogICAgIHZvaWQgY29udGVudHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYpOwog ICAgIHZvaWQgY29udGVudHNTY2FsZUNoYW5nZWQoKTsKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZF UlNJT05fQ0hFQ0soNCwgNywgMikKKyAgICB2b2lkIGJhY2tncm91bmRDb2xvckNoYW5nZWQoKTsK KyNlbmRpZgogCiAgICAgdm9pZCBsb2FkU3RhcnRlZCgpOwogICAgIHZvaWQgbG9hZEZpbmlzaGVk KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJhdGl2ZXdlYnZp ZXcvcmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sIGIvU291cmNlL1dlYktpdC9x dC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3Jlc291cmNlcy93ZWJ2aWV3YmFja2dyb3VuZGNv bG9yLnFtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yZWRjNzk0Ci0tLSAv ZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3 L3Jlc291cmNlcy93ZWJ2aWV3YmFja2dyb3VuZGNvbG9yLnFtbApAQCAtMCwwICsxLDEwIEBACitp bXBvcnQgUXQgNC43CitpbXBvcnQgUXRXZWJLaXQgMS4xCisKK1dlYlZpZXcgeworICAgIGlkOiBt eXdlYgorICAgIGhlaWdodDogMzAwCisgICAgd2lkdGg6IDMwMAorICAgIGZvY3VzOiB0cnVlCisg ICAgYmFja2dyb3VuZENvbG9yIDogInJlZCIKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv cXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5jcHAg Yi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJh dGl2ZXdlYnZpZXcuY3BwCmluZGV4IDAwMjVkNmMuLjEzZTUwNWMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xhcmF0aXZld2Vi dmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3 L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcApAQCAtMSw0ICsxLDUgQEAKICNpbmNsdWRlICIu Li91dGlsLmgiCisjaW5jbHVkZSA8UUNvbG9yPgogI2luY2x1ZGUgPFFEZWJ1Zz4KICNpbmNsdWRl IDxRRGVjbGFyYXRpdmVDb21wb25lbnQ+CiAjaW5jbHVkZSA8UURlY2xhcmF0aXZlRW5naW5lPgpA QCAtMjIsNiArMjMsOSBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgcHJlZmVycmVkSGVpZ2h0 VGVzdCgpOwogICAgIHZvaWQgcHJlZmVycmVkV2lkdGhEZWZhdWx0VGVzdCgpOwogICAgIHZvaWQg cHJlZmVycmVkSGVpZ2h0RGVmYXVsdFRlc3QoKTsKKyNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJ T05fQ0hFQ0soNCwgNywgMikKKyAgICB2b2lkIGJhY2tncm91bmRDb2xvcigpOworI2VuZGlmCiAK IHByaXZhdGU6CiAgICAgdm9pZCBjaGVja05vRXJyb3JzKGNvbnN0IFFEZWNsYXJhdGl2ZUNvbXBv bmVudCYpOwpAQCAtODIsNiArODYsMzYgQEAgdm9pZCB0c3RfUURlY2xhcmF0aXZlV2ViVmlldzo6 cHJlZmVycmVkSGVpZ2h0RGVmYXVsdFRlc3QoKQogICAgIFFDT01QQVJFKHd2LT5wcm9wZXJ0eSgi cHJlZkhlaWdodCIpLnRvRG91YmxlKCksIHZpZXcucHJlZmVycmVkSGVpZ2h0KCkpOwogfQogCisj aWYgUVRfVkVSU0lPTiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDcsIDIpCit2b2lkIHRzdF9RRGVj bGFyYXRpdmVXZWJWaWV3OjpiYWNrZ3JvdW5kQ29sb3IoKQoreworICAgIC8vIFdlIHRlc3QgaGVy ZSB0aGUgcmVuZGVyaW5nIG9mIHRoZSBiYWNrZ3JvdW5kLgorICAgIFFEZWNsYXJhdGl2ZUVuZ2lu ZSBlbmdpbmU7CisgICAgUURlY2xhcmF0aXZlQ29tcG9uZW50IGNvbXBvbmVudCgmZW5naW5lLCBR VXJsKCJxcmM6Ly8vcmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sIikpOworICAg IGNoZWNrTm9FcnJvcnMoY29tcG9uZW50KTsKKyAgICBRT2JqZWN0KiB3diA9IGNvbXBvbmVudC5j cmVhdGUoKTsKKyAgICBRVkVSSUZZKHd2KTsKKyAgICBRQ09NUEFSRSh3di0+cHJvcGVydHkoImJh Y2tncm91bmRDb2xvciIpLnZhbHVlPFFDb2xvcj4oKSwgUUNvbG9yKFF0OjpyZWQpKTsKKyAgICBR RGVjbGFyYXRpdmVWaWV3IHZpZXc7CisgICAgdmlldy5zZXRTb3VyY2UoUVVybCgicXJjOi8vL3Jl c291cmNlcy93ZWJ2aWV3YmFja2dyb3VuZGNvbG9yLnFtbCIpKTsKKyAgICB2aWV3LnNob3coKTsK KyAgICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dTaG93bigmdmlldyk7CisgICAgUVBpeG1hcCByZXN1 bHQodmlldy53aWR0aCgpLCB2aWV3LmhlaWdodCgpKTsKKyAgICBRUGFpbnRlciBwYWludGVyKCZy ZXN1bHQpOworICAgIHZpZXcucmVuZGVyKCZwYWludGVyKTsKKyAgICBRUGl4bWFwIHJlZmVyZW5j ZSh2aWV3LndpZHRoKCksIHZpZXcuaGVpZ2h0KCkpOworICAgIHJlZmVyZW5jZS5maWxsKFF0Ojpy ZWQpOworICAgIFFDT01QQVJFKHJlZmVyZW5jZSwgcmVzdWx0KTsKKworICAgIC8vIFdlIHRlc3Qg dGhlIGVtaXNzaW9uIG9mIHRoZSBiYWNrZ3JvdW5kQ29sb3JDaGFuZ2VkIHNpZ25hbC4KKyAgICBR U2lnbmFsU3B5IHNweUNvbG9yQ2hhbmdlZCh3diwgU0lHTkFMKGJhY2tncm91bmRDb2xvckNoYW5n ZWQoKSkpOworICAgIHd2LT5zZXRQcm9wZXJ0eSgiYmFja2dyb3VuZENvbG9yIiwgUXQ6OnJlZCk7 CisgICAgUUNPTVBBUkUoc3B5Q29sb3JDaGFuZ2VkLmNvdW50KCksIDApOworICAgIHd2LT5zZXRQ cm9wZXJ0eSgiYmFja2dyb3VuZENvbG9yIiwgUXQ6OmdyZWVuKTsKKyAgICBRQ09NUEFSRShzcHlD b2xvckNoYW5nZWQuY291bnQoKSwgMSk7Cit9CisjZW5kaWYKKwogdm9pZCB0c3RfUURlY2xhcmF0 aXZlV2ViVmlldzo6Y2hlY2tOb0Vycm9ycyhjb25zdCBRRGVjbGFyYXRpdmVDb21wb25lbnQmIGNv bXBvbmVudCkKIHsKICAgICAvLyBXYWl0IHVudGlsIHRoZSBjb21wb25lbnQgaXMgcmVhZHkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3Rf cWRlY2xhcmF0aXZld2Vidmlldy5xcmMgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJh dGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcucXJjCmluZGV4IDljMjc0MDkuLmUx NGMzMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vi dmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5xcmMKKysrIGIvU291cmNlL1dlYktpdC9xdC90 ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LnFyYwpAQCAt Myw1ICszLDYgQEAKICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3dlYnZpZXd0ZXN0ZGVmYXVsdC5x bWw8L2ZpbGU+CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy93ZWJ2aWV3dGVzdC5xbWw8L2ZpbGU+ CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy9zYW1wbGUuaHRtbDwvZmlsZT4KKyAgICAgICAgPGZp bGU+cmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sPC9maWxlPgogICAgIDwvcXJl c291cmNlPgogPC9SQ0M+Cg== 84219 2011-03-01 05:51:58 -0800 2011-03-03 06:23:20 -0800 The ifdef trick can't work moc can't parse the Q_PROPERTY anyway because moc ignore the ifdef directives. patch.diff text/plain 7476 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggZWQxZDcyOC4uODM1MzUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNiBAQAogMjAxMS0wMi0yOCAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3Bl bmJvc3NhLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIFF0RGVjbGFyYXRpdmUgV2VidmlldyBlbGVtZW50IGhhcyBhIGZpeGVkIHdoaXRl IGJhY2tncm91bmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQwOTE4CisKKyAgICAgICAgSW1wbGVtZW50IGEgd2F5IHRvIGNoYW5nZSB0aGUgYmFja2dy b3VuZCBjb2xvciBvZiB0aGUgV2ViVmlldyBRTUwgZWxlbWVudC4KKyAgICAgICAgVGhpcyBmZWF0 dXJlIGlzIGFjdGl2YXRlZCBmb3IgUXRXZWJLaXQgMS4xIHZlcnNpb24gb2YgdGhlIHBsdWdpbi4K K2AKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9wbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0UW1s UGx1Z2luOjpyZWdpc3RlclR5cGVzKToKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9xZGVjbGFyYXRp dmV3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFEZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRD b2xvcik6CisgICAgICAgIChRRGVjbGFyYXRpdmVXZWJWaWV3OjpzZXRCYWNrZ3JvdW5kQ29sb3Ip OgorICAgICAgICAqIGRlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oOgorICAgICAg ICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvcmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5k Y29sb3IucW1sOiBBZGRlZC4KKyAgICAgICAgKiB0ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3Rz dF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHRzdF9RRGVjbGFyYXRpdmVXZWJW aWV3OjpiYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZp ZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcucXJjOgorCisyMDExLTAyLTI4ICBBbGV4aXMgTWVu YXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5 IE9saXZlciBIdW50LgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgUXQgcG9ydCBhZnRlciBBUEkg Y2hhbmdlcyBvZiBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC83OTkwNC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAppbmRleCBmMWYxNjVlLi4zNzRjYWJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAKKysrIGIv U291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCkBAIC0zMiw2ICszMiw5IEBA IHB1YmxpYzoKICAgICAgICAgUV9BU1NFUlQoUUxhdGluMVN0cmluZyh1cmkpID09IFFMYXRpbjFT dHJpbmcoIlF0V2ViS2l0IikpOwogICAgICAgICBxbWxSZWdpc3RlclR5cGU8UURlY2xhcmF0aXZl V2ViU2V0dGluZ3M+KCk7CiAgICAgICAgIHFtbFJlZ2lzdGVyVHlwZTxRRGVjbGFyYXRpdmVXZWJW aWV3Pih1cmksIDEsIDAsICJXZWJWaWV3Iik7CisgICAgICAgIHFtbFJlZ2lzdGVyVHlwZTxRRGVj bGFyYXRpdmVXZWJWaWV3Pih1cmksIDEsIDEsICJXZWJWaWV3Iik7CisgICAgICAgIHFtbFJlZ2lz dGVyUmV2aXNpb248UURlY2xhcmF0aXZlV2ViVmlldywgMD4oIlF0V2ViS2l0IiwgMSwgMCk7Cisg ICAgICAgIHFtbFJlZ2lzdGVyUmV2aXNpb248UURlY2xhcmF0aXZlV2ViVmlldywgMT4oIlF0V2Vi S2l0IiwgMSwgMSk7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9k ZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvZGVj bGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKaW5kZXggOTMxM2Q2Yy4uYTRlYTc0NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdl YnZpZXcuY3BwCkBAIC05ODQsNiArOTg0LDI3IEBAIHZvaWQgUURlY2xhcmF0aXZlV2ViVmlldzo6 c2V0Q29udGVudHNTY2FsZShxcmVhbCBzY2FsZSkKIH0KIAogLyohCisgICAgXHFtbHByb3BlcnR5 IGNvbG9yIFdlYlZpZXc6OmJhY2tncm91bmRDb2xvcgorICAgIFxzaW5jZSBRdFdlYktpdCAxLjEK KyAgICBUaGlzIHByb3BlcnR5IGhvbGRzIHRoZSBiYWNrZ3JvdW5kIGNvbG9yIG9mIHRoZSB2aWV3 LgorKi8KKworUUNvbG9yIFFEZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRDb2xvcigpIGNv bnN0Cit7CisgICAgcmV0dXJuIGQtPnZpZXctPnBhbGV0dGUoKS5iYXNlKCkuY29sb3IoKTsKK30K Kwordm9pZCBRRGVjbGFyYXRpdmVXZWJWaWV3OjpzZXRCYWNrZ3JvdW5kQ29sb3IoY29uc3QgUUNv bG9yJiBjb2xvcikKK3sKKyAgICBRUGFsZXR0ZSBwYWxldHRlID0gZC0+dmlldy0+cGFsZXR0ZSgp OworICAgIGlmIChwYWxldHRlLmJhc2UoKS5jb2xvcigpID09IGNvbG9yKQorICAgICAgICByZXR1 cm47CisgICAgcGFsZXR0ZS5zZXRCcnVzaChRUGFsZXR0ZTo6QmFzZSwgY29sb3IpOworICAgIGQt PnZpZXctPnNldFBhbGV0dGUocGFsZXR0ZSk7CisgICAgZW1pdCBiYWNrZ3JvdW5kQ29sb3JDaGFu Z2VkKCk7Cit9CisKKy8qIQogICAgIFJldHVybnMgdGhlIGFyZWEgb2YgdGhlIGxhcmdlc3QgZWxl bWVudCBhdCBwb3NpdGlvbiAoXGEgeCxcYSB5KSB0aGF0IGlzIG5vIGxhcmdlcgogICAgIHRoYW4g XGEgbWF4V2lkdGggYnkgXGEgbWF4SGVpZ2h0IHBpeGVscy4KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaCBiL1NvdXJjZS9X ZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmgKaW5kZXggY2ExNWEx ZS4uYjMxYWEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVj bGFyYXRpdmV3ZWJ2aWV3X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3Fk ZWNsYXJhdGl2ZXdlYnZpZXdfcC5oCkBAIC0xMjMsNiArMTIzLDcgQEAgY2xhc3MgUURlY2xhcmF0 aXZlV2ViVmlldyA6IHB1YmxpYyBRRGVjbGFyYXRpdmVJdGVtIHsKIAogICAgIFFfUFJPUEVSVFko UVNpemUgY29udGVudHNTaXplIFJFQUQgY29udGVudHNTaXplIE5PVElGWSBjb250ZW50c1NpemVD aGFuZ2VkKQogICAgIFFfUFJPUEVSVFkocXJlYWwgY29udGVudHNTY2FsZSBSRUFEIGNvbnRlbnRz U2NhbGUgV1JJVEUgc2V0Q29udGVudHNTY2FsZSBOT1RJRlkgY29udGVudHNTY2FsZUNoYW5nZWQp CisgICAgUV9QUk9QRVJUWShRQ29sb3IgYmFja2dyb3VuZENvbG9yIFJFQUQgYmFja2dyb3VuZENv bG9yIFdSSVRFIHNldEJhY2tncm91bmRDb2xvciBOT1RJRlkgYmFja2dyb3VuZENvbG9yQ2hhbmdl ZCBSRVZJU0lPTiAxKQogCiBwdWJsaWM6CiAgICAgUURlY2xhcmF0aXZlV2ViVmlldyhRRGVjbGFy YXRpdmVJdGVtICpwYXJlbnQgPSAwKTsKQEAgLTE5Myw2ICsxOTQsOSBAQCBwdWJsaWM6CiAgICAg dm9pZCBzZXRDb250ZW50c1NjYWxlKHFyZWFsIHNjYWxlKTsKICAgICBxcmVhbCBjb250ZW50c1Nj YWxlKCkgY29uc3Q7CiAKKyAgICBRX1JFVklTSU9OKDEpIFFDb2xvciBiYWNrZ3JvdW5kQ29sb3Io KSBjb25zdDsKKyAgICBRX1JFVklTSU9OKDEpIHZvaWQgc2V0QmFja2dyb3VuZENvbG9yKGNvbnN0 IFFDb2xvciYpOworCiBRX1NJR05BTFM6CiAgICAgdm9pZCBwcmVmZXJyZWRXaWR0aENoYW5nZWQo KTsKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodENoYW5nZWQoKTsKQEAgLTIwOSw2ICsyMTMsNyBA QCBRX1NJR05BTFM6CiAgICAgdm9pZCByZW5kZXJpbmdFbmFibGVkQ2hhbmdlZCgpOwogICAgIHZv aWQgY29udGVudHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYpOwogICAgIHZvaWQgY29udGVudHNT Y2FsZUNoYW5nZWQoKTsKKyAgICB2b2lkIGJhY2tncm91bmRDb2xvckNoYW5nZWQoKTsKIAogICAg IHZvaWQgbG9hZFN0YXJ0ZWQoKTsKICAgICB2b2lkIGxvYWRGaW5pc2hlZCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3Jlc291cmNlcy93 ZWJ2aWV3YmFja2dyb3VuZGNvbG9yLnFtbCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xh cmF0aXZld2Vidmlldy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91bmRjb2xvci5xbWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmVkYzc5NAotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy9yZXNvdXJjZXMvd2Vi dmlld2JhY2tncm91bmRjb2xvci5xbWwKQEAgLTAsMCArMSwxMCBAQAoraW1wb3J0IFF0IDQuNwor aW1wb3J0IFF0V2ViS2l0IDEuMQorCitXZWJWaWV3IHsKKyAgICBpZDogbXl3ZWIKKyAgICBoZWln aHQ6IDMwMAorICAgIHdpZHRoOiAzMDAKKyAgICBmb2N1czogdHJ1ZQorICAgIGJhY2tncm91bmRD b2xvciA6ICJyZWQiCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNs YXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktp dC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNw cAppbmRleCAwMDI1ZDZjLi4zMTkxZDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rl c3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xhcmF0 aXZld2Vidmlldy5jcHAKQEAgLTEsNCArMSw1IEBACiAjaW5jbHVkZSAiLi4vdXRpbC5oIgorI2lu Y2x1ZGUgPFFDb2xvcj4KICNpbmNsdWRlIDxRRGVidWc+CiAjaW5jbHVkZSA8UURlY2xhcmF0aXZl Q29tcG9uZW50PgogI2luY2x1ZGUgPFFEZWNsYXJhdGl2ZUVuZ2luZT4KQEAgLTIyLDYgKzIzLDcg QEAgcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodFRlc3QoKTsKICAgICB2 b2lkIHByZWZlcnJlZFdpZHRoRGVmYXVsdFRlc3QoKTsKICAgICB2b2lkIHByZWZlcnJlZEhlaWdo dERlZmF1bHRUZXN0KCk7CisgICAgdm9pZCBiYWNrZ3JvdW5kQ29sb3IoKTsKIAogcHJpdmF0ZToK ICAgICB2b2lkIGNoZWNrTm9FcnJvcnMoY29uc3QgUURlY2xhcmF0aXZlQ29tcG9uZW50Jik7CkBA IC04Miw2ICs4NCwzNCBAQCB2b2lkIHRzdF9RRGVjbGFyYXRpdmVXZWJWaWV3OjpwcmVmZXJyZWRI ZWlnaHREZWZhdWx0VGVzdCgpCiAgICAgUUNPTVBBUkUod3YtPnByb3BlcnR5KCJwcmVmSGVpZ2h0 IikudG9Eb3VibGUoKSwgdmlldy5wcmVmZXJyZWRIZWlnaHQoKSk7CiB9CiAKK3ZvaWQgdHN0X1FE ZWNsYXJhdGl2ZVdlYlZpZXc6OmJhY2tncm91bmRDb2xvcigpCit7CisgICAgLy8gV2UgdGVzdCBo ZXJlIHRoZSByZW5kZXJpbmcgb2YgdGhlIGJhY2tncm91bmQuCisgICAgUURlY2xhcmF0aXZlRW5n aW5lIGVuZ2luZTsKKyAgICBRRGVjbGFyYXRpdmVDb21wb25lbnQgY29tcG9uZW50KCZlbmdpbmUs IFFVcmwoInFyYzovLy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91bmRjb2xvci5xbWwiKSk7Cisg ICAgY2hlY2tOb0Vycm9ycyhjb21wb25lbnQpOworICAgIFFPYmplY3QqIHd2ID0gY29tcG9uZW50 LmNyZWF0ZSgpOworICAgIFFWRVJJRlkod3YpOworICAgIFFDT01QQVJFKHd2LT5wcm9wZXJ0eSgi YmFja2dyb3VuZENvbG9yIikudmFsdWU8UUNvbG9yPigpLCBRQ29sb3IoUXQ6OnJlZCkpOworICAg IFFEZWNsYXJhdGl2ZVZpZXcgdmlldzsKKyAgICB2aWV3LnNldFNvdXJjZShRVXJsKCJxcmM6Ly8v cmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sIikpOworICAgIHZpZXcuc2hvdygp OworICAgIFFUZXN0OjpxV2FpdEZvcldpbmRvd1Nob3duKCZ2aWV3KTsKKyAgICBRUGl4bWFwIHJl c3VsdCh2aWV3LndpZHRoKCksIHZpZXcuaGVpZ2h0KCkpOworICAgIFFQYWludGVyIHBhaW50ZXIo JnJlc3VsdCk7CisgICAgdmlldy5yZW5kZXIoJnBhaW50ZXIpOworICAgIFFQaXhtYXAgcmVmZXJl bmNlKHZpZXcud2lkdGgoKSwgdmlldy5oZWlnaHQoKSk7CisgICAgcmVmZXJlbmNlLmZpbGwoUXQ6 OnJlZCk7CisgICAgUUNPTVBBUkUocmVmZXJlbmNlLCByZXN1bHQpOworCisgICAgLy8gV2UgdGVz dCB0aGUgZW1pc3Npb24gb2YgdGhlIGJhY2tncm91bmRDb2xvckNoYW5nZWQgc2lnbmFsLgorICAg IFFTaWduYWxTcHkgc3B5Q29sb3JDaGFuZ2VkKHd2LCBTSUdOQUwoYmFja2dyb3VuZENvbG9yQ2hh bmdlZCgpKSk7CisgICAgd3YtPnNldFByb3BlcnR5KCJiYWNrZ3JvdW5kQ29sb3IiLCBRdDo6cmVk KTsKKyAgICBRQ09NUEFSRShzcHlDb2xvckNoYW5nZWQuY291bnQoKSwgMCk7CisgICAgd3YtPnNl dFByb3BlcnR5KCJiYWNrZ3JvdW5kQ29sb3IiLCBRdDo6Z3JlZW4pOworICAgIFFDT01QQVJFKHNw eUNvbG9yQ2hhbmdlZC5jb3VudCgpLCAxKTsKK30KKwogdm9pZCB0c3RfUURlY2xhcmF0aXZlV2Vi Vmlldzo6Y2hlY2tOb0Vycm9ycyhjb25zdCBRRGVjbGFyYXRpdmVDb21wb25lbnQmIGNvbXBvbmVu dCkKIHsKICAgICAvLyBXYWl0IHVudGlsIHRoZSBjb21wb25lbnQgaXMgcmVhZHkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xh cmF0aXZld2Vidmlldy5xcmMgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJhdGl2ZXdl YnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcucXJjCmluZGV4IDljMjc0MDkuLmUxNGMzMzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90 c3RfcWRlY2xhcmF0aXZld2Vidmlldy5xcmMKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x ZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LnFyYwpAQCAtMyw1ICsz LDYgQEAKICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3dlYnZpZXd0ZXN0ZGVmYXVsdC5xbWw8L2Zp bGU+CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy93ZWJ2aWV3dGVzdC5xbWw8L2ZpbGU+CiAgICAg ICAgIDxmaWxlPnJlc291cmNlcy9zYW1wbGUuaHRtbDwvZmlsZT4KKyAgICAgICAgPGZpbGU+cmVz b3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sPC9maWxlPgogICAgIDwvcXJlc291cmNl PgogPC9SQ0M+ 84551 2011-03-03 06:23:20 -0800 2011-04-25 15:04:33 -0700 #if QT_VERSION >= 0x040702 try. patch.diff text/plain 7708 menard ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggODU1ZDUzMi4uMjc3OTBmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxMS0wMy0wMyAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3Bl bmJvc3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIFF0RGVjbGFyYXRpdmUgV2VidmlldyBlbGVtZW50IGhhcyBhIGZpeGVkIHdoaXRl IGJhY2tncm91bmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQwOTE4CisKKyAgICAgICAgSW1wbGVtZW50IGEgd2F5IHRvIGNoYW5nZSB0aGUgYmFja2dy b3VuZCBjb2xvciBvZiB0aGUgV2ViVmlldyBRTUwgZWxlbWVudC4KKyAgICAgICAgVGhpcyBmZWF0 dXJlIGlzIGFjdGl2YXRlZCBmb3IgUXRXZWJLaXQgMS4xIHZlcnNpb24gb2YgdGhlIHBsdWdpbi4K KworICAgICAgICAqIGRlY2xhcmF0aXZlL3BsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXRRbWxQ bHVnaW46OnJlZ2lzdGVyVHlwZXMpOgorICAgICAgICAqIGRlY2xhcmF0aXZlL3FkZWNsYXJhdGl2 ZXdlYnZpZXcuY3BwOgorICAgICAgICAoUURlY2xhcmF0aXZlV2ViVmlldzo6YmFja2dyb3VuZENv bG9yKToKKyAgICAgICAgKFFEZWNsYXJhdGl2ZVdlYlZpZXc6OnNldEJhY2tncm91bmRDb2xvcik6 CisgICAgICAgICogZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmg6CisgICAgICAg ICogdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91bmRj b2xvci5xbWw6IEFkZGVkLgorICAgICAgICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0 X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwOgorICAgICAgICAodHN0X1FEZWNsYXJhdGl2ZVdlYlZp ZXc6OmJhY2tncm91bmRDb2xvcik6CisgICAgICAgICogdGVzdHMvcWRlY2xhcmF0aXZld2Vidmll dy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5xcmM6CisKIDIwMTEtMDMtMDEgIEpvc2VwaCBQZWNv cmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiBSb2xsIG91 dCByODAwNjggYW5kIHI4MDA3MyBkdWUgdG8gYnJlYWtpbmcgV2ViS2l0MiBRdCBwb3J0LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwIGIvU291cmNl L1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCmluZGV4IGYxZjE2NWUuLjM4YzYxNjkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAKQEAgLTMyLDYgKzMyLDEx IEBAIHB1YmxpYzoKICAgICAgICAgUV9BU1NFUlQoUUxhdGluMVN0cmluZyh1cmkpID09IFFMYXRp bjFTdHJpbmcoIlF0V2ViS2l0IikpOwogICAgICAgICBxbWxSZWdpc3RlclR5cGU8UURlY2xhcmF0 aXZlV2ViU2V0dGluZ3M+KCk7CiAgICAgICAgIHFtbFJlZ2lzdGVyVHlwZTxRRGVjbGFyYXRpdmVX ZWJWaWV3Pih1cmksIDEsIDAsICJXZWJWaWV3Iik7CisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcw MgorICAgICAgICBxbWxSZWdpc3RlclR5cGU8UURlY2xhcmF0aXZlV2ViVmlldz4odXJpLCAxLCAx LCAiV2ViVmlldyIpOworICAgICAgICBxbWxSZWdpc3RlclJldmlzaW9uPFFEZWNsYXJhdGl2ZVdl YlZpZXcsIDA+KCJRdFdlYktpdCIsIDEsIDApOworICAgICAgICBxbWxSZWdpc3RlclJldmlzaW9u PFFEZWNsYXJhdGl2ZVdlYlZpZXcsIDE+KCJRdFdlYktpdCIsIDEsIDEpOworI2VuZGlmCiAgICAg fQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFy YXRpdmV3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0 aXZld2Vidmlldy5jcHAKaW5kZXggOTMxM2Q2Yy4uMTFjODkyOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCkBAIC05ODMs NiArOTgzLDI5IEBAIHZvaWQgUURlY2xhcmF0aXZlV2ViVmlldzo6c2V0Q29udGVudHNTY2FsZShx cmVhbCBzY2FsZSkKICAgICBlbWl0IGNvbnRlbnRzU2NhbGVDaGFuZ2VkKCk7CiB9CiAKKyNpZiBR VF9WRVJTSU9OID49IDB4MDQwNzAyCisvKiEKKyAgICBccW1scHJvcGVydHkgY29sb3IgV2ViVmll dzo6YmFja2dyb3VuZENvbG9yCisgICAgXHNpbmNlIFF0V2ViS2l0IDEuMQorICAgIFRoaXMgcHJv cGVydHkgaG9sZHMgdGhlIGJhY2tncm91bmQgY29sb3Igb2YgdGhlIHZpZXcuCisqLworCitRQ29s b3IgUURlY2xhcmF0aXZlV2ViVmlldzo6YmFja2dyb3VuZENvbG9yKCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gZC0+dmlldy0+cGFsZXR0ZSgpLmJhc2UoKS5jb2xvcigpOworfQorCit2b2lkIFFEZWNs YXJhdGl2ZVdlYlZpZXc6OnNldEJhY2tncm91bmRDb2xvcihjb25zdCBRQ29sb3ImIGNvbG9yKQor eworICAgIFFQYWxldHRlIHBhbGV0dGUgPSBkLT52aWV3LT5wYWxldHRlKCk7CisgICAgaWYgKHBh bGV0dGUuYmFzZSgpLmNvbG9yKCkgPT0gY29sb3IpCisgICAgICAgIHJldHVybjsKKyAgICBwYWxl dHRlLnNldEJydXNoKFFQYWxldHRlOjpCYXNlLCBjb2xvcik7CisgICAgZC0+dmlldy0+c2V0UGFs ZXR0ZShwYWxldHRlKTsKKyAgICBlbWl0IGJhY2tncm91bmRDb2xvckNoYW5nZWQoKTsKK30KKyNl bmRpZgorCiAvKiEKICAgICBSZXR1cm5zIHRoZSBhcmVhIG9mIHRoZSBsYXJnZXN0IGVsZW1lbnQg YXQgcG9zaXRpb24gKFxhIHgsXGEgeSkgdGhhdCBpcyBubyBsYXJnZXIKICAgICB0aGFuIFxhIG1h eFdpZHRoIGJ5IFxhIG1heEhlaWdodCBwaXhlbHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oIGIvU291cmNlL1dlYktpdC9x dC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaAppbmRleCBjYTE1YTFlLi5kMDlk ZjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2 ZXdlYnZpZXdfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0 aXZld2Vidmlld19wLmgKQEAgLTEyMyw2ICsxMjMsOSBAQCBjbGFzcyBRRGVjbGFyYXRpdmVXZWJW aWV3IDogcHVibGljIFFEZWNsYXJhdGl2ZUl0ZW0gewogCiAgICAgUV9QUk9QRVJUWShRU2l6ZSBj b250ZW50c1NpemUgUkVBRCBjb250ZW50c1NpemUgTk9USUZZIGNvbnRlbnRzU2l6ZUNoYW5nZWQp CiAgICAgUV9QUk9QRVJUWShxcmVhbCBjb250ZW50c1NjYWxlIFJFQUQgY29udGVudHNTY2FsZSBX UklURSBzZXRDb250ZW50c1NjYWxlIE5PVElGWSBjb250ZW50c1NjYWxlQ2hhbmdlZCkKKyNpZiBR VF9WRVJTSU9OID49IDB4MDQwNzAyCisgICAgUV9QUk9QRVJUWShRQ29sb3IgYmFja2dyb3VuZENv bG9yIFJFQUQgYmFja2dyb3VuZENvbG9yIFdSSVRFIHNldEJhY2tncm91bmRDb2xvciBOT1RJRlkg YmFja2dyb3VuZENvbG9yQ2hhbmdlZCBSRVZJU0lPTiAxKQorI2VuZGlmCiAKIHB1YmxpYzoKICAg ICBRRGVjbGFyYXRpdmVXZWJWaWV3KFFEZWNsYXJhdGl2ZUl0ZW0gKnBhcmVudCA9IDApOwpAQCAt MTkzLDYgKzE5NiwxMSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb250ZW50c1NjYWxlKHFyZWFs IHNjYWxlKTsKICAgICBxcmVhbCBjb250ZW50c1NjYWxlKCkgY29uc3Q7CiAKKyNpZiBRVF9WRVJT SU9OID49IDB4MDQwNzAyCisgICAgUV9SRVZJU0lPTigxKSBRQ29sb3IgYmFja2dyb3VuZENvbG9y KCkgY29uc3Q7CisgICAgUV9SRVZJU0lPTigxKSB2b2lkIHNldEJhY2tncm91bmRDb2xvcihjb25z dCBRQ29sb3ImKTsKKyNlbmRpZgorCiBRX1NJR05BTFM6CiAgICAgdm9pZCBwcmVmZXJyZWRXaWR0 aENoYW5nZWQoKTsKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodENoYW5nZWQoKTsKQEAgLTIwOSw2 ICsyMTcsOSBAQCBRX1NJR05BTFM6CiAgICAgdm9pZCByZW5kZXJpbmdFbmFibGVkQ2hhbmdlZCgp OwogICAgIHZvaWQgY29udGVudHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYpOwogICAgIHZvaWQg Y29udGVudHNTY2FsZUNoYW5nZWQoKTsKKyNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzAyCisgICAg dm9pZCBiYWNrZ3JvdW5kQ29sb3JDaGFuZ2VkKCk7CisjZW5kaWYKIAogICAgIHZvaWQgbG9hZFN0 YXJ0ZWQoKTsKICAgICB2b2lkIGxvYWRGaW5pc2hlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3Jlc291cmNlcy93ZWJ2aWV3YmFja2dy b3VuZGNvbG9yLnFtbCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmll dy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91bmRjb2xvci5xbWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMmVkYzc5NAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJL aXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy9yZXNvdXJjZXMvd2Vidmlld2JhY2tncm91 bmRjb2xvci5xbWwKQEAgLTAsMCArMSwxMCBAQAoraW1wb3J0IFF0IDQuNworaW1wb3J0IFF0V2Vi S2l0IDEuMQorCitXZWJWaWV3IHsKKyAgICBpZDogbXl3ZWIKKyAgICBoZWlnaHQ6IDMwMAorICAg IHdpZHRoOiAzMDAKKyAgICBmb2N1czogdHJ1ZQorICAgIGJhY2tncm91bmRDb2xvciA6ICJyZWQi Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJhdGl2ZXdlYnZp ZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x ZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcAppbmRleCAwMDI1 ZDZjLi43ZThkNGJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJh dGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5j cHAKQEAgLTEsNCArMSw1IEBACiAjaW5jbHVkZSAiLi4vdXRpbC5oIgorI2luY2x1ZGUgPFFDb2xv cj4KICNpbmNsdWRlIDxRRGVidWc+CiAjaW5jbHVkZSA8UURlY2xhcmF0aXZlQ29tcG9uZW50Pgog I2luY2x1ZGUgPFFEZWNsYXJhdGl2ZUVuZ2luZT4KQEAgLTIyLDYgKzIzLDkgQEAgcHJpdmF0ZSBz bG90czoKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodFRlc3QoKTsKICAgICB2b2lkIHByZWZlcnJl ZFdpZHRoRGVmYXVsdFRlc3QoKTsKICAgICB2b2lkIHByZWZlcnJlZEhlaWdodERlZmF1bHRUZXN0 KCk7CisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwMgorICAgIHZvaWQgYmFja2dyb3VuZENvbG9y KCk7CisjZW5kaWYKIAogcHJpdmF0ZToKICAgICB2b2lkIGNoZWNrTm9FcnJvcnMoY29uc3QgUURl Y2xhcmF0aXZlQ29tcG9uZW50Jik7CkBAIC04Miw2ICs4NiwzNiBAQCB2b2lkIHRzdF9RRGVjbGFy YXRpdmVXZWJWaWV3OjpwcmVmZXJyZWRIZWlnaHREZWZhdWx0VGVzdCgpCiAgICAgUUNPTVBBUkUo d3YtPnByb3BlcnR5KCJwcmVmSGVpZ2h0IikudG9Eb3VibGUoKSwgdmlldy5wcmVmZXJyZWRIZWln aHQoKSk7CiB9CiAKKyNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzAyCit2b2lkIHRzdF9RRGVjbGFy YXRpdmVXZWJWaWV3OjpiYWNrZ3JvdW5kQ29sb3IoKQoreworICAgIC8vIFdlIHRlc3QgaGVyZSB0 aGUgcmVuZGVyaW5nIG9mIHRoZSBiYWNrZ3JvdW5kLgorICAgIFFEZWNsYXJhdGl2ZUVuZ2luZSBl bmdpbmU7CisgICAgUURlY2xhcmF0aXZlQ29tcG9uZW50IGNvbXBvbmVudCgmZW5naW5lLCBRVXJs KCJxcmM6Ly8vcmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sIikpOworICAgIGNo ZWNrTm9FcnJvcnMoY29tcG9uZW50KTsKKyAgICBRT2JqZWN0KiB3diA9IGNvbXBvbmVudC5jcmVh dGUoKTsKKyAgICBRVkVSSUZZKHd2KTsKKyAgICBRQ09NUEFSRSh3di0+cHJvcGVydHkoImJhY2tn cm91bmRDb2xvciIpLnZhbHVlPFFDb2xvcj4oKSwgUUNvbG9yKFF0OjpyZWQpKTsKKyAgICBRRGVj bGFyYXRpdmVWaWV3IHZpZXc7CisgICAgdmlldy5zZXRTb3VyY2UoUVVybCgicXJjOi8vL3Jlc291 cmNlcy93ZWJ2aWV3YmFja2dyb3VuZGNvbG9yLnFtbCIpKTsKKyAgICB2aWV3LnNob3coKTsKKyAg ICBRVGVzdDo6cVdhaXRGb3JXaW5kb3dTaG93bigmdmlldyk7CisgICAgUVBpeG1hcCByZXN1bHQo dmlldy53aWR0aCgpLCB2aWV3LmhlaWdodCgpKTsKKyAgICBRUGFpbnRlciBwYWludGVyKCZyZXN1 bHQpOworICAgIHZpZXcucmVuZGVyKCZwYWludGVyKTsKKyAgICBRUGl4bWFwIHJlZmVyZW5jZSh2 aWV3LndpZHRoKCksIHZpZXcuaGVpZ2h0KCkpOworICAgIHJlZmVyZW5jZS5maWxsKFF0OjpyZWQp OworICAgIFFDT01QQVJFKHJlZmVyZW5jZSwgcmVzdWx0KTsKKworICAgIC8vIFdlIHRlc3QgdGhl IGVtaXNzaW9uIG9mIHRoZSBiYWNrZ3JvdW5kQ29sb3JDaGFuZ2VkIHNpZ25hbC4KKyAgICBRU2ln bmFsU3B5IHNweUNvbG9yQ2hhbmdlZCh3diwgU0lHTkFMKGJhY2tncm91bmRDb2xvckNoYW5nZWQo KSkpOworICAgIHd2LT5zZXRQcm9wZXJ0eSgiYmFja2dyb3VuZENvbG9yIiwgUXQ6OnJlZCk7Cisg ICAgUUNPTVBBUkUoc3B5Q29sb3JDaGFuZ2VkLmNvdW50KCksIDApOworICAgIHd2LT5zZXRQcm9w ZXJ0eSgiYmFja2dyb3VuZENvbG9yIiwgUXQ6OmdyZWVuKTsKKyAgICBRQ09NUEFSRShzcHlDb2xv ckNoYW5nZWQuY291bnQoKSwgMSk7Cit9CisjZW5kaWYKKwogdm9pZCB0c3RfUURlY2xhcmF0aXZl V2ViVmlldzo6Y2hlY2tOb0Vycm9ycyhjb25zdCBRRGVjbGFyYXRpdmVDb21wb25lbnQmIGNvbXBv bmVudCkKIHsKICAgICAvLyBXYWl0IHVudGlsIHRoZSBjb21wb25lbnQgaXMgcmVhZHkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRl Y2xhcmF0aXZld2Vidmlldy5xcmMgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FkZWNsYXJhdGl2 ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcucXJjCmluZGV4IDljMjc0MDkuLmUxNGMz MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmll dy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5xcmMKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0 cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LnFyYwpAQCAtMyw1 ICszLDYgQEAKICAgICAgICAgPGZpbGU+cmVzb3VyY2VzL3dlYnZpZXd0ZXN0ZGVmYXVsdC5xbWw8 L2ZpbGU+CiAgICAgICAgIDxmaWxlPnJlc291cmNlcy93ZWJ2aWV3dGVzdC5xbWw8L2ZpbGU+CiAg ICAgICAgIDxmaWxlPnJlc291cmNlcy9zYW1wbGUuaHRtbDwvZmlsZT4KKyAgICAgICAgPGZpbGU+ cmVzb3VyY2VzL3dlYnZpZXdiYWNrZ3JvdW5kY29sb3IucW1sPC9maWxlPgogICAgIDwvcXJlc291 cmNlPgogPC9SQ0M+Cg== 90952 2011-04-25 15:04:33 -0700 2011-04-25 15:07:04 -0700 fix Qt SDK 4.7.3 build bust due to Q_REVISION being undefined 40918_v1.patch text/plain 4202 s.mathur SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NDgwNCkKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMjUgIFNp ZGRoYXJ0aCBNYXRodXIgIDxzaWRkaGFydGgubWF0aHVyQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEJ1aWxkIGZpeDogUXRE ZWNsYXJhdGl2ZSBXZWJ2aWV3IGVsZW1lbnQgaGFzIGEgZml4ZWQgd2hpdGUgYmFja2dyb3VuZAor CWh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDkxOAorCisgICAgICAg IE1hY3JvIFFfUkVWSVNJT04gYW5kIGFzc29jaWF0ZWQgcWRlY2xyYXRpdmVpdGVtLmggc2lnbmFs cyBhcmUgbm90IGF2YWlsYWJsZSBpbiA0LjcuMyBoZWFkZXJzIGluIE5va2lhIFF0IFNESy4KKwor ICAgICAgICAqIGRlY2xhcmF0aXZlL3BsdWdpbi5jcHA6IEJ1bXAgdXAgcmVxdWlyZWQgdmVyc2lv biB0byA0LjcuNCsKKyAgICAgICAgKFdlYktpdFFtbFBsdWdpbjo6cmVnaXN0ZXJUeXBlcyk6Cisg ICAgICAgICogZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHA6IGRpdHRvCisgICAg ICAgICogZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmg6IGRpdHRvCisgICAgICAg ICogdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5jcHA6 IGRpdHRvCisKIDIwMTEtMDQtMjIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21h aWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NDYyNy4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAJKHJldmlzaW9uIDg0ODAxKQor KysgU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zMiw3ICszMiw3IEBAIHB1YmxpYzoKICAgICAgICAgUV9BU1NFUlQoUUxhdGluMVN0cmlu Zyh1cmkpID09IFFMYXRpbjFTdHJpbmcoIlF0V2ViS2l0IikpOwogICAgICAgICBxbWxSZWdpc3Rl clR5cGU8UURlY2xhcmF0aXZlV2ViU2V0dGluZ3M+KCk7CiAgICAgICAgIHFtbFJlZ2lzdGVyVHlw ZTxRRGVjbGFyYXRpdmVXZWJWaWV3Pih1cmksIDEsIDAsICJXZWJWaWV3Iik7Ci0jaWYgUVRfVkVS U0lPTiA+PSAweDA0MDcwMworI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA3MDQKICAgICAgICAgcW1s UmVnaXN0ZXJUeXBlPFFEZWNsYXJhdGl2ZVdlYlZpZXc+KHVyaSwgMSwgMSwgIldlYlZpZXciKTsK ICAgICAgICAgcW1sUmVnaXN0ZXJSZXZpc2lvbjxRRGVjbGFyYXRpdmVXZWJWaWV3LCAwPigiUXRX ZWJLaXQiLCAxLCAwKTsKICAgICAgICAgcW1sUmVnaXN0ZXJSZXZpc2lvbjxRRGVjbGFyYXRpdmVX ZWJWaWV3LCAxPigiUXRXZWJLaXQiLCAxLCAxKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvZGVj bGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcAkocmV2aXNpb24gODQ4 MDEpCisrKyBTb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXcu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05ODEsNyArOTgxLDcgQEAgdm9pZCBRRGVjbGFyYXRpdmVX ZWJWaWV3OjpzZXRDb250ZW50c1NjYQogICAgIGVtaXQgY29udGVudHNTY2FsZUNoYW5nZWQoKTsK IH0KIAotI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA3MDMKKyNpZiBRVF9WRVJTSU9OID49IDB4MDQw NzA0CiAvKiEKICAgICBccW1scHJvcGVydHkgY29sb3IgV2ViVmlldzo6YmFja2dyb3VuZENvbG9y CiAgICAgXHNpbmNlIFF0V2ViS2l0IDEuMQpJbmRleDogU291cmNlL1dlYktpdC9xdC9kZWNsYXJh dGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oCShyZXZpc2lvbiA4NDgwMSkK KysrIFNvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmgJ KHdvcmtpbmcgY29weSkKQEAgLTEyMyw3ICsxMjMsNyBAQCBjbGFzcyBRRGVjbGFyYXRpdmVXZWJW aWV3IDogcHVibGljIFFEZWNsCiAKICAgICBRX1BST1BFUlRZKFFTaXplIGNvbnRlbnRzU2l6ZSBS RUFEIGNvbnRlbnRzU2l6ZSBOT1RJRlkgY29udGVudHNTaXplQ2hhbmdlZCkKICAgICBRX1BST1BF UlRZKHFyZWFsIGNvbnRlbnRzU2NhbGUgUkVBRCBjb250ZW50c1NjYWxlIFdSSVRFIHNldENvbnRl bnRzU2NhbGUgTk9USUZZIGNvbnRlbnRzU2NhbGVDaGFuZ2VkKQotI2lmIFFUX1ZFUlNJT04gPj0g MHgwNDA3MDMKKyNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzA0CiAgICAgUV9QUk9QRVJUWShRQ29s b3IgYmFja2dyb3VuZENvbG9yIFJFQUQgYmFja2dyb3VuZENvbG9yIFdSSVRFIHNldEJhY2tncm91 bmRDb2xvciBOT1RJRlkgYmFja2dyb3VuZENvbG9yQ2hhbmdlZCBSRVZJU0lPTiAxKQogI2VuZGlm CiAKQEAgLTE5Niw3ICsxOTYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb250ZW50c1NjYWxl KHFyZWFsIHNjYWxlKTsKICAgICBxcmVhbCBjb250ZW50c1NjYWxlKCkgY29uc3Q7CiAKLSNpZiBR VF9WRVJTSU9OID49IDB4MDQwNzAzCisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwNAogICAgIFFf UkVWSVNJT04oMSkgUUNvbG9yIGJhY2tncm91bmRDb2xvcigpIGNvbnN0OwogICAgIFFfUkVWSVNJ T04oMSkgdm9pZCBzZXRCYWNrZ3JvdW5kQ29sb3IoY29uc3QgUUNvbG9yJik7CiAjZW5kaWYKQEAg LTIxNyw3ICsyMTcsNyBAQCBRX1NJR05BTFM6CiAgICAgdm9pZCByZW5kZXJpbmdFbmFibGVkQ2hh bmdlZCgpOwogICAgIHZvaWQgY29udGVudHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYpOwogICAg IHZvaWQgY29udGVudHNTY2FsZUNoYW5nZWQoKTsKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzAz CisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwNAogICAgIHZvaWQgYmFja2dyb3VuZENvbG9yQ2hh bmdlZCgpOwogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0 aXZld2Vidmlldy90c3RfcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9xdC90ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3 ZWJ2aWV3LmNwcAkocmV2aXNpb24gODQ4MDEpCisrKyBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3Fk ZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MSw3ICs0MSw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCByZW5kZXJpbmdF bmFibGVkKCk7CiAgICAgdm9pZCBzZXRIdG1sKCk7CiAgICAgdm9pZCBzZXR0aW5ncygpOwotI2lm IFFUX1ZFUlNJT04gPj0gMHgwNDA3MDMKKyNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzA0CiAgICAg dm9pZCBiYWNrZ3JvdW5kQ29sb3IoKTsKICNlbmRpZgogCkBAIC00OTEsNyArNDkxLDcgQEAgdm9p ZCB0c3RfUURlY2xhcmF0aXZlV2ViVmlldzo6c2V0dGluZ3MoKQogICAgIH0KIH0KIAotI2lmIFFU X1ZFUlNJT04gPj0gMHgwNDA3MDMKKyNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzA0CiB2b2lkIHRz dF9RRGVjbGFyYXRpdmVXZWJWaWV3OjpiYWNrZ3JvdW5kQ29sb3IoKQogewogICAgIC8vIFdlIHRl c3QgaGVyZSB0aGUgcmVuZGVyaW5nIG9mIHRoZSBiYWNrZ3JvdW5kLgo= 90953 2011-04-25 15:07:04 -0700 2011-04-26 08:37:03 -0700 fix indent in Changelog 40918_v2.patch text/plain 4209 s.mathur SW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NDgwNCkKKysrIFNvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMjUgIFNp ZGRoYXJ0aCBNYXRodXIgIDxzaWRkaGFydGgubWF0aHVyQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEJ1aWxkIGZpeDogUXRE ZWNsYXJhdGl2ZSBXZWJ2aWV3IGVsZW1lbnQgaGFzIGEgZml4ZWQgd2hpdGUgYmFja2dyb3VuZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5MTgKKwor ICAgICAgICBNYWNybyBRX1JFVklTSU9OIGFuZCBhc3NvY2lhdGVkIHFkZWNscmF0aXZlaXRlbS5o IHNpZ25hbHMgYXJlIG5vdCBhdmFpbGFibGUgaW4gNC43LjMgaGVhZGVycyBpbiBOb2tpYSBRdCBT REsuCisKKyAgICAgICAgKiBkZWNsYXJhdGl2ZS9wbHVnaW4uY3BwOiBCdW1wIHVwIHJlcXVpcmVk IHZlcnNpb24gdG8gNC43LjQrCisgICAgICAgIChXZWJLaXRRbWxQbHVnaW46OnJlZ2lzdGVyVHlw ZXMpOgorICAgICAgICAqIGRlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwOiBkaXR0 bworICAgICAgICAqIGRlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oOiBkaXR0bwor ICAgICAgICAqIHRlc3RzL3FkZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZp ZXcuY3BwOiBkaXR0bworCiAyMDExLTA0LTIyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcu Ym90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODQ2Mjcu CkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCShyZXZpc2lvbiA4 NDgwMSkKKysrIFNvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQCBwdWJsaWM6CiAgICAgICAgIFFfQVNTRVJUKFFMYXRp bjFTdHJpbmcodXJpKSA9PSBRTGF0aW4xU3RyaW5nKCJRdFdlYktpdCIpKTsKICAgICAgICAgcW1s UmVnaXN0ZXJUeXBlPFFEZWNsYXJhdGl2ZVdlYlNldHRpbmdzPigpOwogICAgICAgICBxbWxSZWdp c3RlclR5cGU8UURlY2xhcmF0aXZlV2ViVmlldz4odXJpLCAxLCAwLCAiV2ViVmlldyIpOwotI2lm IFFUX1ZFUlNJT04gPj0gMHgwNDA3MDMKKyNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzA0CiAgICAg ICAgIHFtbFJlZ2lzdGVyVHlwZTxRRGVjbGFyYXRpdmVXZWJWaWV3Pih1cmksIDEsIDEsICJXZWJW aWV3Iik7CiAgICAgICAgIHFtbFJlZ2lzdGVyUmV2aXNpb248UURlY2xhcmF0aXZlV2ViVmlldywg MD4oIlF0V2ViS2l0IiwgMSwgMCk7CiAgICAgICAgIHFtbFJlZ2lzdGVyUmV2aXNpb248UURlY2xh cmF0aXZlV2ViVmlldywgMT4oIlF0V2ViS2l0IiwgMSwgMSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0 L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHAJKHJldmlz aW9uIDg0ODAxKQorKysgU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3 ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTgxLDcgKzk4MSw3IEBAIHZvaWQgUURlY2xh cmF0aXZlV2ViVmlldzo6c2V0Q29udGVudHNTY2EKICAgICBlbWl0IGNvbnRlbnRzU2NhbGVDaGFu Z2VkKCk7CiB9CiAKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzAzCisjaWYgUVRfVkVSU0lPTiA+ PSAweDA0MDcwNAogLyohCiAgICAgXHFtbHByb3BlcnR5IGNvbG9yIFdlYlZpZXc6OmJhY2tncm91 bmRDb2xvcgogICAgIFxzaW5jZSBRdFdlYktpdCAxLjEKSW5kZXg6IFNvdXJjZS9XZWJLaXQvcXQv ZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaAkocmV2aXNpb24g ODQ4MDEpCisrKyBTb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZp ZXdfcC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjMsNyArMTIzLDcgQEAgY2xhc3MgUURlY2xhcmF0 aXZlV2ViVmlldyA6IHB1YmxpYyBRRGVjbAogCiAgICAgUV9QUk9QRVJUWShRU2l6ZSBjb250ZW50 c1NpemUgUkVBRCBjb250ZW50c1NpemUgTk9USUZZIGNvbnRlbnRzU2l6ZUNoYW5nZWQpCiAgICAg UV9QUk9QRVJUWShxcmVhbCBjb250ZW50c1NjYWxlIFJFQUQgY29udGVudHNTY2FsZSBXUklURSBz ZXRDb250ZW50c1NjYWxlIE5PVElGWSBjb250ZW50c1NjYWxlQ2hhbmdlZCkKLSNpZiBRVF9WRVJT SU9OID49IDB4MDQwNzAzCisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwNAogICAgIFFfUFJPUEVS VFkoUUNvbG9yIGJhY2tncm91bmRDb2xvciBSRUFEIGJhY2tncm91bmRDb2xvciBXUklURSBzZXRC YWNrZ3JvdW5kQ29sb3IgTk9USUZZIGJhY2tncm91bmRDb2xvckNoYW5nZWQgUkVWSVNJT04gMSkK ICNlbmRpZgogCkBAIC0xOTYsNyArMTk2LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29udGVu dHNTY2FsZShxcmVhbCBzY2FsZSk7CiAgICAgcXJlYWwgY29udGVudHNTY2FsZSgpIGNvbnN0Owog Ci0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwMworI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA3MDQK ICAgICBRX1JFVklTSU9OKDEpIFFDb2xvciBiYWNrZ3JvdW5kQ29sb3IoKSBjb25zdDsKICAgICBR X1JFVklTSU9OKDEpIHZvaWQgc2V0QmFja2dyb3VuZENvbG9yKGNvbnN0IFFDb2xvciYpOwogI2Vu ZGlmCkBAIC0yMTcsNyArMjE3LDcgQEAgUV9TSUdOQUxTOgogICAgIHZvaWQgcmVuZGVyaW5nRW5h YmxlZENoYW5nZWQoKTsKICAgICB2b2lkIGNvbnRlbnRzU2l6ZUNoYW5nZWQoY29uc3QgUVNpemUm KTsKICAgICB2b2lkIGNvbnRlbnRzU2NhbGVDaGFuZ2VkKCk7Ci0jaWYgUVRfVkVSU0lPTiA+PSAw eDA0MDcwMworI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA3MDQKICAgICB2b2lkIGJhY2tncm91bmRD b2xvckNoYW5nZWQoKTsKICNlbmRpZgogCkluZGV4OiBTb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3Fk ZWNsYXJhdGl2ZXdlYnZpZXcvdHN0X3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcWRlY2xhcmF0aXZld2Vidmlldy90c3RfcWRlY2xh cmF0aXZld2Vidmlldy5jcHAJKHJldmlzaW9uIDg0ODAxKQorKysgU291cmNlL1dlYktpdC9xdC90 ZXN0cy9xZGVjbGFyYXRpdmV3ZWJ2aWV3L3RzdF9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgcmVu ZGVyaW5nRW5hYmxlZCgpOwogICAgIHZvaWQgc2V0SHRtbCgpOwogICAgIHZvaWQgc2V0dGluZ3Mo KTsKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzAzCisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcw NAogICAgIHZvaWQgYmFja2dyb3VuZENvbG9yKCk7CiAjZW5kaWYKIApAQCAtNDkxLDcgKzQ5MSw3 IEBAIHZvaWQgdHN0X1FEZWNsYXJhdGl2ZVdlYlZpZXc6OnNldHRpbmdzKCkKICAgICB9CiB9CiAK LSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzAzCisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwNAog dm9pZCB0c3RfUURlY2xhcmF0aXZlV2ViVmlldzo6YmFja2dyb3VuZENvbG9yKCkKIHsKICAgICAv LyBXZSB0ZXN0IGhlcmUgdGhlIHJlbmRlcmluZyBvZiB0aGUgYmFja2dyb3VuZC4K 91607 2011-04-28 17:46:41 -0700 2011-04-28 19:32:36 -0700 Patch bug-40918-20110428204736.patch text/plain 3848 kamaji U3VidmVyc2lvbiBSZXZpc2lvbjogODUyNjMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNTNlNjM3NjMzYjBk ZDc4MjBhODBiMjhiNGYwNGZhMzcwOTBiMjU2Mi4uZTVmN2MxNWUxY2QzMWM3MmE4NzM1NDJhNGY0 YWZmNTQyOTE4NWNkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wNC0y OCAgS2VpdGggS3l6aXZhdCAgPGtlaXRoLmt5eml2YXRAbm9raWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUXREZWNsYXJhdGl2ZSBX ZWJ2aWV3IGVsZW1lbnQgaGFzIGEgZml4ZWQgd2hpdGUgYmFja2dyb3VuZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5MTgKKworICAgICAgICBRUHJv cGVydHkgUkVWSVNJT04gZmVhdHVyZSBpcyBub3QgcHJlc2VudCBpbiBjZXJ0YWluIFF0IFRydW5r IGNsb25lcy4KKyAgICAgICAgVGhlc2UgYnVpbGRzIHJlcG9ydCB0aGVpciB2ZXJzaW9uIGFzIDQu OC4wLCBhbmQgdGhlcmVmb3JlIGJyZWFrIG9uIHRoZQorICAgICAgICBwcmlvciAjaWYgUVRfVkVS U0lPTiA+PSAweDA0MDcwNC4gIFRoZSBwcm9wZXIgZml4IGlzIHRvIGNoZWNrIGJhc2VkIG9uCisg ICAgICAgIHRoZSBleGlzdGFuY2Ugb2YgUV9SRVZJU0lPTi4gIFRoaXMgYWRkcyB0aGF0LgorCisg ICAgICAgICogZGVjbGFyYXRpdmUvcGx1Z2luLmNwcDoKKyAgICAgICAgKFdlYktpdFFtbFBsdWdp bjo6cmVnaXN0ZXJUeXBlcyk6CisgICAgICAgICogZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vi dmlldy5jcHA6CisgICAgICAgICogZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmg6 CisKIDIwMTEtMDQtMjggIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L2RlY2xhcmF0aXZlL3BsdWdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0 aXZlL3BsdWdpbi5jcHAKaW5kZXggY2YxYjJjMWM0MDI3YTc0ZGMwMTdmNGQwMDNmNjQ0MTY1NjJk OTE1ZS4uYWZkN2NmMTM0MDI3YWJiMGQzZDgxOTcxYWM5NzJiNWUyMzA5MWY1MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvcXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcApAQCAtMzIsNyArMzIsNyBAQCBwdWJsaWM6 CiAgICAgICAgIFFfQVNTRVJUKFFMYXRpbjFTdHJpbmcodXJpKSA9PSBRTGF0aW4xU3RyaW5nKCJR dFdlYktpdCIpKTsKICAgICAgICAgcW1sUmVnaXN0ZXJUeXBlPFFEZWNsYXJhdGl2ZVdlYlNldHRp bmdzPigpOwogICAgICAgICBxbWxSZWdpc3RlclR5cGU8UURlY2xhcmF0aXZlV2ViVmlldz4odXJp LCAxLCAwLCAiV2ViVmlldyIpOwotI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA3MDQKKyNpZiBRVF9W RVJTSU9OID49IDB4MDQwNzA0ICYmIGRlZmluZWQoUV9SRVZJU0lPTikKICAgICAgICAgcW1sUmVn aXN0ZXJUeXBlPFFEZWNsYXJhdGl2ZVdlYlZpZXc+KHVyaSwgMSwgMSwgIldlYlZpZXciKTsKICAg ICAgICAgcW1sUmVnaXN0ZXJSZXZpc2lvbjxRRGVjbGFyYXRpdmVXZWJWaWV3LCAwPigiUXRXZWJL aXQiLCAxLCAwKTsKICAgICAgICAgcW1sUmVnaXN0ZXJSZXZpc2lvbjxRRGVjbGFyYXRpdmVXZWJW aWV3LCAxPigiUXRXZWJLaXQiLCAxLCAxKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv ZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L2Rl Y2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCmluZGV4IDc0Zjc4ZDAwNTJhMDQ3ZTVi NDYzNjY1YWJmYTBjOWM2M2E3Nzc4NzguLmRhYTgxMzNlMjM2MzQ2MTY4NTBhY2E0MTgwYzRjYjY5 ZmMzZjQ3YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xh cmF0aXZld2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVj bGFyYXRpdmV3ZWJ2aWV3LmNwcApAQCAtOTgxLDcgKzk4MSw3IEBAIHZvaWQgUURlY2xhcmF0aXZl V2ViVmlldzo6c2V0Q29udGVudHNTY2FsZShxcmVhbCBzY2FsZSkKICAgICBlbWl0IGNvbnRlbnRz U2NhbGVDaGFuZ2VkKCk7CiB9CiAKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzA0CisjaWYgUVRf VkVSU0lPTiA+PSAweDA0MDcwNCAmJiBkZWZpbmVkKFFfUkVWSVNJT04pCiAvKiEKICAgICBccW1s cHJvcGVydHkgY29sb3IgV2ViVmlldzo6YmFja2dyb3VuZENvbG9yCiAgICAgXHNpbmNlIFF0V2Vi S2l0IDEuMQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFy YXRpdmV3ZWJ2aWV3X3AuaCBiL1NvdXJjZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0 aXZld2Vidmlld19wLmgKaW5kZXggNmExOTc0MjI2ZGY5YmY5NGQ2ZDg1NzRhMDcyNzlkZTU3MGRk MmNkYy4uNGM1ZGExNjgyYmUyMWYzODU2NzZjMmE1NzRkMmY0NTJlMDczZjYyNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaAor KysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5o CkBAIC0xMjMsNyArMTIzLDcgQEAgY2xhc3MgUURlY2xhcmF0aXZlV2ViVmlldyA6IHB1YmxpYyBR RGVjbGFyYXRpdmVJdGVtIHsKIAogICAgIFFfUFJPUEVSVFkoUVNpemUgY29udGVudHNTaXplIFJF QUQgY29udGVudHNTaXplIE5PVElGWSBjb250ZW50c1NpemVDaGFuZ2VkKQogICAgIFFfUFJPUEVS VFkocXJlYWwgY29udGVudHNTY2FsZSBSRUFEIGNvbnRlbnRzU2NhbGUgV1JJVEUgc2V0Q29udGVu dHNTY2FsZSBOT1RJRlkgY29udGVudHNTY2FsZUNoYW5nZWQpCi0jaWYgUVRfVkVSU0lPTiA+PSAw eDA0MDcwNAorI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA3MDQgJiYgZGVmaW5lZChRX1JFVklTSU9O KQogICAgIFFfUFJPUEVSVFkoUUNvbG9yIGJhY2tncm91bmRDb2xvciBSRUFEIGJhY2tncm91bmRD b2xvciBXUklURSBzZXRCYWNrZ3JvdW5kQ29sb3IgTk9USUZZIGJhY2tncm91bmRDb2xvckNoYW5n ZWQgUkVWSVNJT04gMSkKICNlbmRpZgogCkBAIC0xOTYsNyArMTk2LDcgQEAgcHVibGljOgogICAg IHZvaWQgc2V0Q29udGVudHNTY2FsZShxcmVhbCBzY2FsZSk7CiAgICAgcXJlYWwgY29udGVudHNT Y2FsZSgpIGNvbnN0OwogCi0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwNAorI2lmIFFUX1ZFUlNJ T04gPj0gMHgwNDA3MDQgJiYgZGVmaW5lZChRX1JFVklTSU9OKQogICAgIFFfUkVWSVNJT04oMSkg UUNvbG9yIGJhY2tncm91bmRDb2xvcigpIGNvbnN0OwogICAgIFFfUkVWSVNJT04oMSkgdm9pZCBz ZXRCYWNrZ3JvdW5kQ29sb3IoY29uc3QgUUNvbG9yJik7CiAjZW5kaWYKQEAgLTIxNyw3ICsyMTcs NyBAQCBRX1NJR05BTFM6CiAgICAgdm9pZCByZW5kZXJpbmdFbmFibGVkQ2hhbmdlZCgpOwogICAg IHZvaWQgY29udGVudHNTaXplQ2hhbmdlZChjb25zdCBRU2l6ZSYpOwogICAgIHZvaWQgY29udGVu dHNTY2FsZUNoYW5nZWQoKTsKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzA0CisjaWYgUVRfVkVS U0lPTiA+PSAweDA0MDcwNCAmJiBkZWZpbmVkKFFfUkVWSVNJT04pCiAgICAgdm9pZCBiYWNrZ3Jv dW5kQ29sb3JDaGFuZ2VkKCk7CiAjZW5kaWYKIAo= 91621 2011-04-28 19:32:44 -0700 2011-05-03 12:51:34 -0700 Patch bug-40918-20110428223339.patch text/plain 3671 kamaji U3VidmVyc2lvbiBSZXZpc2lvbjogODUyNjMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNTNlNjM3NjMzYjBk ZDc4MjBhODBiMjhiNGYwNGZhMzcwOTBiMjU2Mi4uMjhjMTQwNTBmYjlmNjY2MmI4OGI4M2RkYTNl MWUyZTZjNGVlM2JhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wNC0y OCAgS2VpdGggS3l6aXZhdCAgPGtlaXRoLmt5eml2YXRAbm9raWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUXREZWNsYXJhdGl2ZSBX ZWJ2aWV3IGVsZW1lbnQgaGFzIGEgZml4ZWQgd2hpdGUgYmFja2dyb3VuZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5MTgKKworICAgICAgICBRUHJv cGVydHkgUkVWSVNJT04gZmVhdHVyZSBpcyBub3QgcHJlc2VudCBpbiBjZXJ0YWluIFF0IFRydW5r IGNsb25lcy4KKyAgICAgICAgVGhlc2UgYnVpbGRzIHJlcG9ydCB0aGVpciB2ZXJzaW9uIGFzIDQu OC4wLCBhbmQgdGhlcmVmb3JlIGJyZWFrIG9uIHRoZQorICAgICAgICBwcmlvciAjaWYgUVRfVkVS U0lPTiA+PSAweDA0MDcwNC4gIFRoZSBwcm9wZXIgZml4IGlzIHRvIGNoZWNrIGJhc2VkIG9uCisg ICAgICAgIHRoZSBleGlzdGFuY2Ugb2YgUV9SRVZJU0lPTi4KKworICAgICAgICAqIGRlY2xhcmF0 aXZlL3BsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXRRbWxQbHVnaW46OnJlZ2lzdGVyVHlwZXMp OgorICAgICAgICAqIGRlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwOgorICAgICAg ICAqIGRlY2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oOgorCiAyMDExLTA0LTI4ICBZ YWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBBbmRyZWFzIEtsaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2 ZS9wbHVnaW4uY3BwIGIvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9wbHVnaW4uY3BwCmlu ZGV4IGNmMWIyYzFjNDAyN2E3NGRjMDE3ZjRkMDAzZjY0NDE2NTYyZDkxNWUuLmU0YzlhZjM2YWYz OGI1ODNhNTNjNzdjYzI5OWZmZGMzODk2NzQyZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv cXQvZGVjbGFyYXRpdmUvcGx1Z2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0 aXZlL3BsdWdpbi5jcHAKQEAgLTMyLDcgKzMyLDcgQEAgcHVibGljOgogICAgICAgICBRX0FTU0VS VChRTGF0aW4xU3RyaW5nKHVyaSkgPT0gUUxhdGluMVN0cmluZygiUXRXZWJLaXQiKSk7CiAgICAg ICAgIHFtbFJlZ2lzdGVyVHlwZTxRRGVjbGFyYXRpdmVXZWJTZXR0aW5ncz4oKTsKICAgICAgICAg cW1sUmVnaXN0ZXJUeXBlPFFEZWNsYXJhdGl2ZVdlYlZpZXc+KHVyaSwgMSwgMCwgIldlYlZpZXci KTsKLSNpZiBRVF9WRVJTSU9OID49IDB4MDQwNzA0CisjaWZkZWYgUV9SRVZJU0lPTgogICAgICAg ICBxbWxSZWdpc3RlclR5cGU8UURlY2xhcmF0aXZlV2ViVmlldz4odXJpLCAxLCAxLCAiV2ViVmll dyIpOwogICAgICAgICBxbWxSZWdpc3RlclJldmlzaW9uPFFEZWNsYXJhdGl2ZVdlYlZpZXcsIDA+ KCJRdFdlYktpdCIsIDEsIDApOwogICAgICAgICBxbWxSZWdpc3RlclJldmlzaW9uPFFEZWNsYXJh dGl2ZVdlYlZpZXcsIDE+KCJRdFdlYktpdCIsIDEsIDEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlldy5jcHAKaW5kZXggNzRmNzhkMDA1 MmEwNDdlNWI0NjM2NjVhYmZhMGM5YzYzYTc3Nzg3OC4uNmJhMTM0NjJjY2E5NGFjZGZkOTQxMjQz YWYxZDllZGVjMjY2ZTE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2 ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2RlY2xhcmF0 aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXcuY3BwCkBAIC05ODEsNyArOTgxLDcgQEAgdm9pZCBRRGVj bGFyYXRpdmVXZWJWaWV3OjpzZXRDb250ZW50c1NjYWxlKHFyZWFsIHNjYWxlKQogICAgIGVtaXQg Y29udGVudHNTY2FsZUNoYW5nZWQoKTsKIH0KIAotI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA3MDQK KyNpZmRlZiBRX1JFVklTSU9OCiAvKiEKICAgICBccW1scHJvcGVydHkgY29sb3IgV2ViVmlldzo6 YmFja2dyb3VuZENvbG9yCiAgICAgXHNpbmNlIFF0V2ViS2l0IDEuMQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9xdC9kZWNsYXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaCBiL1NvdXJj ZS9XZWJLaXQvcXQvZGVjbGFyYXRpdmUvcWRlY2xhcmF0aXZld2Vidmlld19wLmgKaW5kZXggNmEx OTc0MjI2ZGY5YmY5NGQ2ZDg1NzRhMDcyNzlkZTU3MGRkMmNkYy4uMmYwYzU5YzI1ZmIzY2EwNjQw ZGEwOTUyM2ZjNmFhY2Y4YmNlYTY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9kZWNs YXJhdGl2ZS9xZGVjbGFyYXRpdmV3ZWJ2aWV3X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L2Rl Y2xhcmF0aXZlL3FkZWNsYXJhdGl2ZXdlYnZpZXdfcC5oCkBAIC0xMjMsNyArMTIzLDcgQEAgY2xh c3MgUURlY2xhcmF0aXZlV2ViVmlldyA6IHB1YmxpYyBRRGVjbGFyYXRpdmVJdGVtIHsKIAogICAg IFFfUFJPUEVSVFkoUVNpemUgY29udGVudHNTaXplIFJFQUQgY29udGVudHNTaXplIE5PVElGWSBj b250ZW50c1NpemVDaGFuZ2VkKQogICAgIFFfUFJPUEVSVFkocXJlYWwgY29udGVudHNTY2FsZSBS RUFEIGNvbnRlbnRzU2NhbGUgV1JJVEUgc2V0Q29udGVudHNTY2FsZSBOT1RJRlkgY29udGVudHNT Y2FsZUNoYW5nZWQpCi0jaWYgUVRfVkVSU0lPTiA+PSAweDA0MDcwNAorI2lmZGVmIFFfUkVWSVNJ T04KICAgICBRX1BST1BFUlRZKFFDb2xvciBiYWNrZ3JvdW5kQ29sb3IgUkVBRCBiYWNrZ3JvdW5k Q29sb3IgV1JJVEUgc2V0QmFja2dyb3VuZENvbG9yIE5PVElGWSBiYWNrZ3JvdW5kQ29sb3JDaGFu Z2VkIFJFVklTSU9OIDEpCiAjZW5kaWYKIApAQCAtMTk2LDcgKzE5Niw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldENvbnRlbnRzU2NhbGUocXJlYWwgc2NhbGUpOwogICAgIHFyZWFsIGNvbnRlbnRz U2NhbGUoKSBjb25zdDsKIAotI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA3MDQKKyNpZmRlZiBRX1JF VklTSU9OCiAgICAgUV9SRVZJU0lPTigxKSBRQ29sb3IgYmFja2dyb3VuZENvbG9yKCkgY29uc3Q7 CiAgICAgUV9SRVZJU0lPTigxKSB2b2lkIHNldEJhY2tncm91bmRDb2xvcihjb25zdCBRQ29sb3Im KTsKICNlbmRpZgpAQCAtMjE3LDcgKzIxNyw3IEBAIFFfU0lHTkFMUzoKICAgICB2b2lkIHJlbmRl cmluZ0VuYWJsZWRDaGFuZ2VkKCk7CiAgICAgdm9pZCBjb250ZW50c1NpemVDaGFuZ2VkKGNvbnN0 IFFTaXplJik7CiAgICAgdm9pZCBjb250ZW50c1NjYWxlQ2hhbmdlZCgpOwotI2lmIFFUX1ZFUlNJ T04gPj0gMHgwNDA3MDQKKyNpZmRlZiBRX1JFVklTSU9OCiAgICAgdm9pZCBiYWNrZ3JvdW5kQ29s b3JDaGFuZ2VkKCk7CiAjZW5kaWYKIAo=