36533 2010-03-24 08:18:02 -0700 [Qt] Compilation error on Qt for Embedded Linux built with -qconfig small 2010-05-07 00:45:01 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Other Linux CLOSED FIXED Qt P2 Normal --- 35784 0 tasuku.suzuki webkit-unassigned abarth commit-queue hausmann oldest_to_newest 203410 0 tasuku.suzuki 2010-03-24 08:18:02 -0700 -qconfig small disables some features like settings, input context and so on. 203413 1 51499 tasuku.suzuki 2010-03-24 08:25:06 -0700 Created attachment 51499 add #ifndef QT_NO_LIBRARY ~ #endif 203419 2 51501 tasuku.suzuki 2010-03-24 08:38:00 -0700 Created attachment 51501 add #ifndef QT_NO_IM ~ #endif 203424 3 51504 tasuku.suzuki 2010-03-24 08:48:25 -0700 Created attachment 51504 add #ifndef QT_NO_SETTINGS ~ #endif 203436 4 51509 tasuku.suzuki 2010-03-24 09:09:34 -0700 Created attachment 51509 add #ifndef QT_NO_DEBUG_STREAM ~ #endif 203439 5 51511 tasuku.suzuki 2010-03-24 09:16:33 -0700 Created attachment 51511 add #ifndef QT_NO_DESKTOPSERVICES ~ #endif 203831 6 51501 eric 2010-03-24 23:42:30 -0700 Comment on attachment 51501 add #ifndef QT_NO_IM ~ #endif What does this do, and why is it useful? What does NO_IM mean? 203832 7 51504 eric 2010-03-24 23:43:26 -0700 Comment on attachment 51504 add #ifndef QT_NO_SETTINGS ~ #endif This seems specific to inspector settings. Why woudl it be called NO_SETTINGS? I expected this to deal with Settings.h Please explain what you're tryign to do in the ChangeLog. 203833 8 51509 eric 2010-03-24 23:44:11 -0700 Comment on attachment 51509 add #ifndef QT_NO_DEBUG_STREAM ~ #endif OK. 203835 9 51511 eric 2010-03-24 23:44:43 -0700 Comment on attachment 51511 add #ifndef QT_NO_DESKTOPSERVICES ~ #endif OK. 203836 10 51499 eric 2010-03-24 23:47:21 -0700 Comment on attachment 51499 add #ifndef QT_NO_LIBRARY ~ #endif Seems sane. ChangeLog could be better. 203962 11 51499 commit-queue 2010-03-25 03:12:51 -0700 Comment on attachment 51499 add #ifndef QT_NO_LIBRARY ~ #endif Clearing flags on attachment: 51499 Committed r56525: <http://trac.webkit.org/changeset/56525> 204004 12 51509 commit-queue 2010-03-25 05:22:33 -0700 Comment on attachment 51509 add #ifndef QT_NO_DEBUG_STREAM ~ #endif Clearing flags on attachment: 51509 Committed r56533: <http://trac.webkit.org/changeset/56533> 204007 13 tasuku.suzuki 2010-03-25 05:35:48 -0700 (In reply to comment #6) > (From update of attachment 51501 [details]) > What does this do, and why is it useful? What does NO_IM mean? QT_NO_IM disables QInputContext that abstracts the input method dependent data and composing state. The patch adds an ifdef to check QInputContext's availability. 204014 14 51511 commit-queue 2010-03-25 06:21:08 -0700 Comment on attachment 51511 add #ifndef QT_NO_DESKTOPSERVICES ~ #endif Clearing flags on attachment: 51511 Committed r56536: <http://trac.webkit.org/changeset/56536> 204015 15 commit-queue 2010-03-25 06:21:13 -0700 All reviewed patches have been landed. Closing bug. 204093 16 51647 tasuku.suzuki 2010-03-25 09:31:02 -0700 Created attachment 51647 add #ifndef QT_NO_SETTINGS ~ #endif > This seems specific to inspector settings. Why woudl it be called NO_SETTINGS? > I expected this to deal with Settings.h Please explain what you're tryign to > do in the ChangeLog. We need to check if QSettings is available with the macro QT_NO_SETTINGS. If QSettings is disabled by Qt, inspector should not get/set settings. 204732 17 tasuku.suzuki 2010-03-26 12:53:16 -0700 This is not resolved yet. 207540 18 51647 eric 2010-04-01 17:38:31 -0700 Comment on attachment 51647 add #ifndef QT_NO_SETTINGS ~ #endif This seems sad. This will spew a bunch of warnings. But OK. 207617 19 51647 commit-queue 2010-04-01 20:35:00 -0700 Comment on attachment 51647 add #ifndef QT_NO_SETTINGS ~ #endif Rejecting patch 51647 from commit-queue. Unexpected failure when landing patch! Please file a bug against webkit-patch. Failed to run "['WebKitTools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', 'land-attachment', '--force-clean', '--non-interactive', '--build-style=both', '--quiet', '51647', '--parent-command=commit-queue', '--no-update']" exit_code: 1 ERROR: Builders ["Leopard Intel Release (Tests)"] are red, please do not commit. See http://build.webkit.org. Pass --ignore-builders to bypass this check. 207650 20 51647 eric 2010-04-01 21:48:57 -0700 Comment on attachment 51647 add #ifndef QT_NO_SETTINGS ~ #endif That's our bug, not yours. 207657 21 abarth 2010-04-01 21:56:09 -0700 > That's our bug, not yours. https://bugs.webkit.org/show_bug.cgi?id=37009 in fact. 207797 22 51647 commit-queue 2010-04-02 01:16:52 -0700 Comment on attachment 51647 add #ifndef QT_NO_SETTINGS ~ #endif Clearing flags on attachment: 51647 Committed r56984: <http://trac.webkit.org/changeset/56984> 207798 23 commit-queue 2010-04-02 01:16:58 -0700 All reviewed patches have been landed. Closing bug. 210661 24 hausmann 2010-04-09 03:16:41 -0700 Re-opening becaues of missing QT_NO_IM patch. 210662 25 51504 hausmann 2010-04-09 03:18:14 -0700 Comment on attachment 51504 add #ifndef QT_NO_SETTINGS ~ #endif This patch is correct, it's the correct feature define in Qt for the QSettings class. 210663 26 tasuku.suzuki 2010-04-09 03:29:45 -0700 (In reply to comment #25) > (From update of attachment 51504 [details]) > This patch is correct, it's the correct feature define in Qt for the QSettings > class. An alternative patch has been merged here https://bugs.webkit.org/show_bug.cgi?id=36533#c22 see also https://bugs.webkit.org/show_bug.cgi?id=36533#c7 https://bugs.webkit.org/show_bug.cgi?id=36533#c16 211085 27 51501 commit-queue 2010-04-09 19:16:37 -0700 Comment on attachment 51501 add #ifndef QT_NO_IM ~ #endif Clearing flags on attachment: 51501 Committed r57397: <http://trac.webkit.org/changeset/57397> 211086 28 commit-queue 2010-04-09 19:16:45 -0700 All reviewed patches have been landed. Closing bug. 222228 29 hausmann 2010-05-07 00:44:41 -0700 Revision r56525 cherry-picked into qtwebkit-2.0 with commit c59c560624f3fad76ff71ea1b1022543397a779e Revision r56533 cherry-picked into qtwebkit-2.0 with commit 7e5b806e5d6b024c4faf3f604c41b7d2f952c37d Revision r56536 cherry-picked into qtwebkit-2.0 with commit 74e3c511cdf041acdcdec3d34e1fa39f1595d043 Revision r56984 cherry-picked into qtwebkit-2.0 with commit 2adfb941d211c17eab2f06ac91d0c83c51576537 Revision r57397 cherry-picked into qtwebkit-2.0 with commit 6493fd316cbe4aed752ea3541affbb6f10a0aeb0 51499 2010-03-24 08:25:06 -0700 2010-03-25 03:12:50 -0700 add #ifndef QT_NO_LIBRARY ~ #endif qtwebkit-qconfig-small-qt_no_library.patch text/plain 1540 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzNkNDFhOC4uZWMzMmM1ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wMy0yNCAgVGFzdWt1IFN1enVr aSAgPHRhc3VrdS5zdXp1a2lAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF1GaXggY29tcGlsZSBlcnJvciB3aXRoIFFUX05PX0xJ QlJBUlkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2 NTMzCisKKyAgICAgICAgKiBwbGF0Zm9ybS9GaWxlU3lzdGVtLmg6CisgICAgICAgICogcGxhdGZv cm0vcXQvRmlsZVN5c3RlbVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVubG9hZE1vZHVsZSk6 CisKIDIwMTAtMDMtMjQgIFRhc3VrdSBTdXp1a2kgIDx0YXN1a3Uuc3V6dWtpQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9GaWxlU3lzdGVtLmgK aW5kZXggODU2ZDViYi4uYzIzNjgzMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9GaWxl U3lzdGVtLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9GaWxlU3lzdGVtLmgKQEAgLTY5LDkgKzY5 LDExIEBAIHR5cGVkZWYgSE1PRFVMRSBQbGF0Zm9ybU1vZHVsZTsKICNlbGlmIFBMQVRGT1JNKFFU KQogI2lmIGRlZmluZWQoUV9XU19NQUMpCiB0eXBlZGVmIENGQnVuZGxlUmVmIFBsYXRmb3JtTW9k dWxlOwotI2Vsc2UKKyNlbGlmICFkZWZpbmVkKFFUX05PX0xJQlJBUlkpCiB0eXBlZGVmIFFMaWJy YXJ5KiBQbGF0Zm9ybU1vZHVsZTsKLSNlbmRpZiAvLyBkZWZpbmVkKFFfV1NfTUFDKQorI2Vsc2UK K3R5cGVkZWYgdm9pZCogUGxhdGZvcm1Nb2R1bGU7CisjZW5kaWYKICNlbGlmIFBMQVRGT1JNKEdU SykKIHR5cGVkZWYgR01vZHVsZSogUGxhdGZvcm1Nb2R1bGU7CiAjZWxpZiBQTEFURk9STShDRikK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvRmlsZVN5c3RlbVF0LmNwcCBiL1dlYkNv cmUvcGxhdGZvcm0vcXQvRmlsZVN5c3RlbVF0LmNwcAppbmRleCA0MDkzZmFkLi5mOWNlZDk4IDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3F0L0ZpbGVTeXN0ZW1RdC5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9xdC9GaWxlU3lzdGVtUXQuY3BwCkBAIC0xNTQsMTEgKzE1NCwxMiBAQCBi b29sIHVubG9hZE1vZHVsZShQbGF0Zm9ybU1vZHVsZSBtb2R1bGUpCiAgICAgcmV0dXJuIDo6RnJl ZUxpYnJhcnkobW9kdWxlKTsKIAogI2Vsc2UKKyNpZm5kZWYgUVRfTk9fTElCUkFSWQogICAgIGlm IChtb2R1bGUtPnVubG9hZCgpKSB7CiAgICAgICAgIGRlbGV0ZSBtb2R1bGU7CiAgICAgICAgIHJl dHVybiB0cnVlOwogICAgIH0KLQorI2VuZGlmCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCiB9 Cg== 51501 2010-03-24 08:38:00 -0700 2010-04-09 19:16:37 -0700 add #ifndef QT_NO_IM ~ #endif qtwebkit-qconfig-small-qt_no_im.patch text/plain 1278 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGVhYjUxOGQuLmJiNGIzMTUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEwLTAzLTI0ICBUYXN1 a3UgU3V6dWtpICA8dGFzdWt1LnN1enVraUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XUZpeCBjb21waWxlIGVycm9yIHdpdGgg UVRfTk9fSU0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM2NTMzCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9wdXAuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UXRGYWxsYmFja1dlYlBvcHVwQ29tYm86OmhpZGVQb3B1cCk6 CisKIDIwMTAtMDMtMjUgIFRhc3VrdSBTdXp1a2kgIDx0YXN1a3Uuc3V6dWtpQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9wdXAuY3BwIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAKaW5kZXggM2Y2MDIyNS4uMjAwMzMx NyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1 cC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5j cHAKQEAgLTU1LDYgKzU1LDcgQEAgdm9pZCBRdEZhbGxiYWNrV2ViUG9wdXBDb21ibzo6c2hvd1Bv cHVwKCkKIAogdm9pZCBRdEZhbGxiYWNrV2ViUG9wdXBDb21ibzo6aGlkZVBvcHVwKCkKIHsKKyNp Zm5kZWYgUVRfTk9fSU0KICAgICBRV2lkZ2V0KiBhY3RpdmVGb2N1cyA9IFFBcHBsaWNhdGlvbjo6 Zm9jdXNXaWRnZXQoKTsKICAgICBpZiAoYWN0aXZlRm9jdXMgJiYgYWN0aXZlRm9jdXMgPT0gUUNv bWJvQm94Ojp2aWV3KCkKICAgICAgICAgJiYgYWN0aXZlRm9jdXMtPnRlc3RBdHRyaWJ1dGUoUXQ6 OldBX0lucHV0TWV0aG9kRW5hYmxlZCkpIHsKQEAgLTY0LDYgKzY1LDcgQEAgdm9pZCBRdEZhbGxi YWNrV2ViUG9wdXBDb21ibzo6aGlkZVBvcHVwKCkKICAgICAgICAgICAgIHFpYy0+c2V0Rm9jdXNX aWRnZXQoMCk7CiAgICAgICAgIH0KICAgICB9CisjZW5kaWYgLy8gUVRfTk9fSU0KIAogICAgIFFD b21ib0JveDo6aGlkZVBvcHVwKCk7CiAK 51504 2010-03-24 08:48:25 -0700 2010-04-09 03:18:14 -0700 add #ifndef QT_NO_SETTINGS ~ #endif qtwebkit-qconfig-small-qt_no_settings.patch text/plain 2307 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGJiNGIzMTUuLmFiNGNlNjIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEwLTAzLTI0ICBUYXN1 a3UgU3V6dWtpICA8dGFzdWt1LnN1enVraUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XUZpeCBjb21waWxlIGVycm9yIHdpdGgg UVRfTk9fU0VUVElOR1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM2NTMzCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRR dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRRdDo6cG9wdWxhdGVTZXR0 aW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0OjpzdG9yZVNldHRpbmcp OgorCiAyMDEwLTAzLTI0ICBUYXN1a3UgU3V6dWtpICA8dGFzdWt1LnN1enVraUBub2tpYS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcAppbmRleCA5YmY3YjJlLi44ZDUxNmEz IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQu Y3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRRdC5jcHAK QEAgLTExMCw2ICsxMTAsMTAgQEAgdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6aGlkZUhpZ2hsaWdo dCgpCiAKIHZvaWQgSW5zcGVjdG9yQ2xpZW50UXQ6OnBvcHVsYXRlU2V0dGluZyhjb25zdCBTdHJp bmcmIGtleSwgU3RyaW5nKiBzZXR0aW5nKQogeworI2lmZGVmIFFUX05PX1NFVFRJTkdTCisgICAg UV9VTlVTRUQoa2V5KQorICAgIFFfVU5VU0VEKHNldHRpbmcpCisjZWxzZQogICAgIFFTZXR0aW5n cyBxc2V0dGluZ3M7CiAgICAgaWYgKHFzZXR0aW5ncy5zdGF0dXMoKSA9PSBRU2V0dGluZ3M6OkFj Y2Vzc0Vycm9yKSB7CiAgICAgICAgIC8vIFFDb3JlQXBwbGljYXRpb246OnNldE9yZ2FuaXphdGlv bk5hbWUgYW5kIFFDb3JlQXBwbGljYXRpb246OnNldEFwcGxpY2F0aW9uTmFtZSBoYXZlbid0IGJl ZW4gY2FsbGVkCkBAIC0xMjMsMTAgKzEyNywxNSBAQCB2b2lkIEluc3BlY3RvckNsaWVudFF0Ojpw b3B1bGF0ZVNldHRpbmcoY29uc3QgU3RyaW5nJiBrZXksIFN0cmluZyogc2V0dGluZykKICAgICBR VmFyaWFudCBzdG9yZWRWYWx1ZSA9IHFzZXR0aW5ncy52YWx1ZShzZXR0aW5nS2V5KTsKICAgICBz dG9yZWRWYWx1ZS5jb252ZXJ0KFFWYXJpYW50OjpuYW1lVG9UeXBlKHN0b3JlZFZhbHVlVHlwZS50 b0FzY2lpKCkuZGF0YSgpKSk7CiAgICAgKnNldHRpbmcgPSB2YXJpYW50VG9TZXR0aW5nKHN0b3Jl ZFZhbHVlKTsKKyNlbmRpZiAvLyBRVF9OT19TRVRUSU5HUwogfQogCiB2b2lkIEluc3BlY3RvckNs aWVudFF0OjpzdG9yZVNldHRpbmcoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgc2V0 dGluZykKIHsKKyNpZmRlZiBRVF9OT19TRVRUSU5HUworICAgIFFfVU5VU0VEKGtleSkKKyAgICBR X1VOVVNFRChzZXR0aW5nKQorI2Vsc2UKICAgICBRU2V0dGluZ3MgcXNldHRpbmdzOwogICAgIGlm IChxc2V0dGluZ3Muc3RhdHVzKCkgPT0gUVNldHRpbmdzOjpBY2Nlc3NFcnJvcikgewogICAgICAg ICBxV2FybmluZygiUVdlYkluc3BlY3RvcjogUVNldHRpbmdzIGNvdWxkbid0IHBlcnNpc3QgY29u ZmlndXJhdGlvbiBzZXR0aW5nIFslc10uIiwKQEAgLTEzOCw2ICsxNDcsNyBAQCB2b2lkIEluc3Bl Y3RvckNsaWVudFF0OjpzdG9yZVNldHRpbmcoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmlu ZyYgc2V0dGluZykKICAgICBRU3RyaW5nIHNldHRpbmdLZXkoc2V0dGluZ1N0b3JhZ2VQcmVmaXgg KyBrZXkpOwogICAgIHFzZXR0aW5ncy5zZXRWYWx1ZShzZXR0aW5nS2V5LCB2YWx1ZVRvU3RvcmUp OwogICAgIHFzZXR0aW5ncy5zZXRWYWx1ZShzZXR0aW5nS2V5ICsgc2V0dGluZ1N0b3JhZ2VUeXBl U3VmZml4LCBRVmFyaWFudDo6dHlwZVRvTmFtZSh2YWx1ZVRvU3RvcmUudHlwZSgpKSk7CisjZW5k aWYgLy8gUVRfTk9fU0VUVElOR1MKIH0KIAogc3RhdGljIFN0cmluZyB2YXJpYW50VG9TZXR0aW5n KGNvbnN0IFFWYXJpYW50JiBxdmFyaWFudCkK 51509 2010-03-24 09:09:34 -0700 2010-03-25 05:22:33 -0700 add #ifndef QT_NO_DEBUG_STREAM ~ #endif qtwebkit-qconfig-small-qt_no_debug_stream.patch text/plain 1154 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAgYi9XZWJLaXQv cXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDM2NjU3OTEuLmViMzllNTkgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L3F0 L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMzk0LDcgKzM5NCw5IEBAIFFSZWN0RiBRR3Jh cGhpY3NXZWJWaWV3UHJpdmF0ZTo6Z3JhcGhpY3NJdGVtVmlzaWJsZVJlY3QoKSBjb25zdAogICAg ICAgICByZXR1cm4gUVJlY3RGKCk7CiAgICAgUUxpc3Q8UUdyYXBoaWNzVmlldyo+IHZpZXdzID0g cS0+c2NlbmUoKS0+dmlld3MoKTsKICAgICBpZiAodmlld3Muc2l6ZSgpID4gMSkgeworI2lmbmRl ZiBRVF9OT19ERUJVR19TVFJFQU0KICAgICAgICAgcURlYnVnKCkgPDwgIlFHcmFwaGljc1dlYlZp ZXcgaXMgaW4gbW9yZSB0aGFuIG9uZSBncmFwaGljcyB2aWV3cywgdW5hYmxlIHRvIGNvbXB1dGUg dGhlIHZpc2libGUgcmVjdCI7CisjZW5kaWYKICAgICAgICAgcmV0dXJuIFFSZWN0RigpOwogICAg IH0KICAgICBpZiAodmlld3Muc2l6ZSgpIDwgMSkKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFu Z2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGFiNGNlNjIuLjlhM2EwYmMgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDEwLTAzLTI0ICBUYXN1a3UgU3V6dWtpICA8dGFzdWt1LnN1enVraUBu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XUZpeCBjb21waWxlIGVycm9yIHdpdGggUVRfTk9fREVCVUdfU1RSRUFNCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjUzMworCisgICAgICAg ICogQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlld1By aXZhdGU6OmdyYXBoaWNzSXRlbVZpc2libGVSZWN0KToKKwogMjAxMC0wMy0yNSAgVGFzdWt1IFN1 enVraSAgPHRhc3VrdS5zdXp1a2lAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgo= 51511 2010-03-24 09:16:33 -0700 2010-03-25 06:21:08 -0700 add #ifndef QT_NO_DESKTOPSERVICES ~ #endif qtwebkit-qconfig-small-qt_no_desktopservices.patch text/plain 1160 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcCBiL1dlYktpdC9xdC9B cGkvcXdlYnNldHRpbmdzLmNwcAppbmRleCBjYTdkYWYwLi4zNTc0Y2M2IDEwMDY0NAotLS0gYS9X ZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vic2V0 dGluZ3MuY3BwCkBAIC0xMDMxLDggKzEwMzEsOSBAQCB2b2lkIFFXZWJTZXR0aW5nczo6ZW5hYmxl UGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgUVN0cmluZyYgcGF0aCkKICAgICBRU3RyaW5nIHN0b3Jh Z2VQYXRoOwogCiAgICAgaWYgKHBhdGguaXNFbXB0eSgpKSB7CisjaWZuZGVmIFFUX05PX0RFU0tU T1BTRVJWSUNFUwogICAgICAgICBzdG9yYWdlUGF0aCA9IFFEZXNrdG9wU2VydmljZXM6OnN0b3Jh Z2VMb2NhdGlvbihRRGVza3RvcFNlcnZpY2VzOjpEYXRhTG9jYXRpb24pOwotCisjZW5kaWYKICAg ICAgICAgaWYgKHN0b3JhZ2VQYXRoLmlzRW1wdHkoKSkKICAgICAgICAgICAgIHN0b3JhZ2VQYXRo ID0gV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KFFEaXI6OmhvbWVQYXRoKCksIFFD b3JlQXBwbGljYXRpb246OmFwcGxpY2F0aW9uTmFtZSgpKTsKICAgICB9IGVsc2UKZGlmZiAtLWdp dCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDlhM2Ew YmMuLjM4ZmJmMGUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEwLTAzLTI0ICBUYXN1a3UgU3V6dWtp ICA8dGFzdWt1LnN1enVraUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1F0XUZpeCBjb21waWxlIGVycm9yIHdpdGggUVRfTk9fREVT S1RPUFNFUlZJQ0VTCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNjUzMworCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6CisgICAgICAgIChR V2ViU2V0dGluZ3M6OmVuYWJsZVBlcnNpc3RlbnRTdG9yYWdlKToKKwogMjAxMC0wMy0yNCAgVGFz dWt1IFN1enVraSAgPHRhc3VrdS5zdXp1a2lAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgo= 51647 2010-03-25 09:31:02 -0700 2010-04-02 01:16:52 -0700 add #ifndef QT_NO_SETTINGS ~ #endif qtwebkit-qconfig-small-qt_no_settings2.patch text/plain 2510 tasuku.suzuki ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IDNjZmQwM2YuLjJhZDZhMGQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTAzLTI1ICBUYXN1 a3UgU3V6dWtpICA8dGFzdWt1LnN1enVraUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XUZpeCBjb21waWxlIGVycm9yIHdpdGgg UVRfTk9fU0VUVElOR1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM2NTMzCisKKyAgICAgICAgSWYgUVRfTk9fU0VUVElOR1MgaXMgZGVmaW5lZCwgUVNl dHRpbmdzIGlzIG5vdCBhdmFpbGFibGUuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9JbnNw ZWN0b3JDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRRdDo6 cG9wdWxhdGVTZXR0aW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFF0Ojpz dG9yZVNldHRpbmcpOgorCiAyMDEwLTAzLTI0ICBUYXN1a3UgU3V6dWtpICA8dGFzdWt1LnN1enVr aUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwIGIv V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcAppbmRleCA5YmY3 YjJlLi4wMjU0YjMyIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVj dG9yQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JD bGllbnRRdC5jcHAKQEAgLTExMCw2ICsxMTAsMTEgQEAgdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6 aGlkZUhpZ2hsaWdodCgpCiAKIHZvaWQgSW5zcGVjdG9yQ2xpZW50UXQ6OnBvcHVsYXRlU2V0dGlu Zyhjb25zdCBTdHJpbmcmIGtleSwgU3RyaW5nKiBzZXR0aW5nKQogeworI2lmZGVmIFFUX05PX1NF VFRJTkdTCisgICAgUV9VTlVTRUQoa2V5KQorICAgIFFfVU5VU0VEKHNldHRpbmcpCisgICAgcVdh cm5pbmcoIlFXZWJJbnNwZWN0b3I6IFFTZXR0aW5ncyBpcyBub3Qgc3VwcG9ydGVkIGJ5IFF0LiIp OworI2Vsc2UKICAgICBRU2V0dGluZ3MgcXNldHRpbmdzOwogICAgIGlmIChxc2V0dGluZ3Muc3Rh dHVzKCkgPT0gUVNldHRpbmdzOjpBY2Nlc3NFcnJvcikgewogICAgICAgICAvLyBRQ29yZUFwcGxp Y2F0aW9uOjpzZXRPcmdhbml6YXRpb25OYW1lIGFuZCBRQ29yZUFwcGxpY2F0aW9uOjpzZXRBcHBs aWNhdGlvbk5hbWUgaGF2ZW4ndCBiZWVuIGNhbGxlZApAQCAtMTIzLDEwICsxMjgsMTYgQEAgdm9p ZCBJbnNwZWN0b3JDbGllbnRRdDo6cG9wdWxhdGVTZXR0aW5nKGNvbnN0IFN0cmluZyYga2V5LCBT dHJpbmcqIHNldHRpbmcpCiAgICAgUVZhcmlhbnQgc3RvcmVkVmFsdWUgPSBxc2V0dGluZ3MudmFs dWUoc2V0dGluZ0tleSk7CiAgICAgc3RvcmVkVmFsdWUuY29udmVydChRVmFyaWFudDo6bmFtZVRv VHlwZShzdG9yZWRWYWx1ZVR5cGUudG9Bc2NpaSgpLmRhdGEoKSkpOwogICAgICpzZXR0aW5nID0g dmFyaWFudFRvU2V0dGluZyhzdG9yZWRWYWx1ZSk7CisjZW5kaWYgLy8gUVRfTk9fU0VUVElOR1MK IH0KIAogdm9pZCBJbnNwZWN0b3JDbGllbnRRdDo6c3RvcmVTZXR0aW5nKGNvbnN0IFN0cmluZyYg a2V5LCBjb25zdCBTdHJpbmcmIHNldHRpbmcpCiB7CisjaWZkZWYgUVRfTk9fU0VUVElOR1MKKyAg ICBRX1VOVVNFRChrZXkpCisgICAgUV9VTlVTRUQoc2V0dGluZykKKyAgICBxV2FybmluZygiUVdl Ykluc3BlY3RvcjogUVNldHRpbmdzIGlzIG5vdCBzdXBwb3J0ZWQgYnkgUXQuIik7CisjZWxzZQog ICAgIFFTZXR0aW5ncyBxc2V0dGluZ3M7CiAgICAgaWYgKHFzZXR0aW5ncy5zdGF0dXMoKSA9PSBR U2V0dGluZ3M6OkFjY2Vzc0Vycm9yKSB7CiAgICAgICAgIHFXYXJuaW5nKCJRV2ViSW5zcGVjdG9y OiBRU2V0dGluZ3MgY291bGRuJ3QgcGVyc2lzdCBjb25maWd1cmF0aW9uIHNldHRpbmcgWyVzXS4i LApAQCAtMTM4LDYgKzE0OSw3IEBAIHZvaWQgSW5zcGVjdG9yQ2xpZW50UXQ6OnN0b3JlU2V0dGlu Zyhjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBzZXR0aW5nKQogICAgIFFTdHJpbmcg c2V0dGluZ0tleShzZXR0aW5nU3RvcmFnZVByZWZpeCArIGtleSk7CiAgICAgcXNldHRpbmdzLnNl dFZhbHVlKHNldHRpbmdLZXksIHZhbHVlVG9TdG9yZSk7CiAgICAgcXNldHRpbmdzLnNldFZhbHVl KHNldHRpbmdLZXkgKyBzZXR0aW5nU3RvcmFnZVR5cGVTdWZmaXgsIFFWYXJpYW50Ojp0eXBlVG9O YW1lKHZhbHVlVG9TdG9yZS50eXBlKCkpKTsKKyNlbmRpZiAvLyBRVF9OT19TRVRUSU5HUwogfQog CiBzdGF0aWMgU3RyaW5nIHZhcmlhbnRUb1NldHRpbmcoY29uc3QgUVZhcmlhbnQmIHF2YXJpYW50 KQo=