37100 2010-04-05 11:26:22 -0700 [Symbian] Consolidate Symbian WINSCW environment configuration 2010-04-06 02:59:56 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC S60 3rd edition CLOSED FIXED Qt P2 Normal --- 35784 1 laszlo.gombos webkit-unassigned commit-queue hausmann kenneth oldest_to_newest 208592 0 laszlo.gombos 2010-04-05 11:26:22 -0700 WINSCW is a cross-compilation environment running on Windows. For this environment WIN32, OS(WIN) and PLATFORM(WIN) should not be defined. Currently some of this logic is in WebCore/config.h and some in JavaScriptCore/wtf/Platform.h. It make sense to consolidate this logic into Platform.h as this is related to global environment setup for WINSCW. For example after r56623 WIN32 is _not_ defined when compiling WebCore with WINSCW but it is defined when compiling JavaScriptCore. This can lead to hard-to-find build issues. 208597 1 52547 laszlo.gombos 2010-04-05 11:32:24 -0700 Created attachment 52547 proposed patch 208599 2 52548 laszlo.gombos 2010-04-05 11:34:27 -0700 Created attachment 52548 2nd try, remove extra whitespace 208822 3 52548 commit-queue 2010-04-05 17:55:25 -0700 Comment on attachment 52548 2nd try, remove extra whitespace Clearing flags on attachment: 52548 Committed r57108: <http://trac.webkit.org/changeset/57108> 208823 4 commit-queue 2010-04-05 17:55:30 -0700 All reviewed patches have been landed. Closing bug. 208963 5 hausmann 2010-04-06 02:55:49 -0700 <cherry-pick-for-backport: r57076> 208964 6 hausmann 2010-04-06 02:59:47 -0700 Revision r57076 cherry-picked into qtwebkit-2.0 with commit ac69c2f69372089990b04b3425da1d2eb2697ae0 Revision r57108 cherry-picked into qtwebkit-2.0 with commit 5bfb5ac38f9981f950c7116001844d3f7b681d67 52547 2010-04-05 11:32:24 -0700 2010-04-05 11:34:27 -0700 proposed patch 37100.patch text/plain 2667 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU3MDg2KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDQtMDUgIExhc3psbyBH b21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtTeW1iaWFuXSBDb25zb2xpZGF0ZSBTeW1iaWFu IFdJTlNDVyBlbnZpcm9ubWVudCBjb25maWd1cmF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzEwMAorCisgICAgICAgIE1vdmUgdGhlICJ1bmRl ZmluaXRpb24iIG9mIFdJTjMyIGFuZCBfV0lOMzIgZnJvbSBXZWJDb3JlL2NvbmZpZy5oCisgICAg ICAgIHRvIEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oIGFzIGl0IGlzIG5vdCBzcGVjaWZp YyB0byBXZWJDb3JlLgorCisgICAgICAgIFBMQVRGT1JNKFdJTikgYW5kIE9TKFdJTikgbm8gbG9u Z2VyIG5lZWRzIHRvIGJlIHVuZGVmaW5lZCBhcworICAgICAgICB1bmRlZmluaW5nIFdJTjMyIHRh a2VzIGNhcmUgb2YgaXQuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoKKwogMjAxMC0wNC0w MyAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZv cm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNp b24gNTcwODUpCisrKyBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5 KQpAQCAtOTEsMTAgKzkxLDE1IEBACiAvKiBDT01QSUxFUihXSU5TQ1cpIC0gQ29kZVdhcnJpb3Ig Zm9yIFN5bWJpYW4gZW11bGF0b3IgKi8KICNpZiBkZWZpbmVkKF9fV0lOU0NXX18pCiAjZGVmaW5l IFdURl9DT01QSUxFUl9XSU5TQ1cgMQorLyogY3Jvc3MtY29tcGlsaW5nLCBpdCBpcyBub3QgcmVh bGx5IHdpbmRvd3MgKi8KKyN1bmRlZiBXSU4zMgorI3VuZGVmIF9XSU4zMgogI2VuZGlmCiAKIAog CisKKwogLyogPT09PSBDUFUoKSAtIHRoZSB0YXJnZXQgQ1BVIGFyY2hpdGVjdHVyZSA9PT09ICov CiAKIC8qIFRoaXMgYWxzbyBkZWZpbmVzIENQVShCSUdfRU5ESUFOKSBvciBDUFUoTUlERExFX0VO RElBTikgb3IgbmVpdGhlciwgYXMgYXBwcm9wcmlhdGUuICovCkBAIC0zOTcsOSArNDAyLDYgQEAK IAogLyogT1MoU1lNQklBTikgLSBTeW1iaWFuICovCiAjaWYgZGVmaW5lZCAoX19TWU1CSUFOMzJf XykKLS8qIHdlIGFyZSBjcm9zcy1jb21waWxpbmcsIGl0IGlzIG5vdCByZWFsbHkgd2luZG93cyAq LwotI3VuZGVmIFdURl9PU19XSU5ET1dTCi0jdW5kZWYgV1RGX1BMQVRGT1JNX1dJTgogI2RlZmlu ZSBXVEZfT1NfU1lNQklBTiAxCiAjZW5kaWYKIApJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU3MDg2KQorKysgV2ViQ29y ZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNC0wNSAg TGFzemxvIEdvbWJvcyAgPGxhc3psby4xLmdvbWJvc0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1N5bWJpYW5dIENvbnNvbGlkYXRl IFN5bWJpYW4gV0lOU0NXIGVudmlyb25tZW50IGNvbmZpZ3VyYXRpb24KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MTAwCisKKyAgICAgICAgTW92ZSB0 aGUgInVuZGVmaW5pdGlvbiIgb2YgV0lOMzIgYW5kIF9XSU4zMiBmcm9tIFdlYkNvcmUvY29uZmln LmgKKyAgICAgICAgdG8gSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmggYXMgaXQgaXMgbm90 IHNwZWNpZmljIHRvIFdlYkNvcmUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoZXJlIGlz IG5vIG5ldyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogY29uZmlnLmg6CisKIDIwMTAtMDQt MDUgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEtlbm5ldGggUm9oZGUtQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViQ29yZS9jb25maWcuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2NvbmZpZy5oCShyZXZpc2lvbiA1NzA4NSkKKysrIFdlYkNv cmUvY29uZmlnLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3MCw4ICsxNzAsNiBAQAogI2VuZGlmIC8v IFBMQVRGT1JNKE1BQykKIAogI2lmIE9TKFNZTUJJQU4pCi0jdW5kZWYgV0lOMzIKLSN1bmRlZiBf V0lOMzIKICNkZWZpbmUgVVNFX1NZU1RFTV9NQUxMT0MgMQogI2VuZGlmCiAK 52548 2010-04-05 11:34:27 -0700 2010-04-05 17:55:25 -0700 2nd try, remove extra whitespace 37100.patch text/plain 2513 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU3MDg2KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDQtMDUgIExhc3psbyBH b21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtTeW1iaWFuXSBDb25zb2xpZGF0ZSBTeW1iaWFu IFdJTlNDVyBlbnZpcm9ubWVudCBjb25maWd1cmF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzEwMAorCisgICAgICAgIE1vdmUgdGhlICJ1bmRl ZmluaXRpb24iIG9mIFdJTjMyIGFuZCBfV0lOMzIgZnJvbSBXZWJDb3JlL2NvbmZpZy5oCisgICAg ICAgIHRvIEphdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oIGFzIGl0IGlzIG5vdCBzcGVjaWZp YyB0byBXZWJDb3JlLgorCisgICAgICAgIFBMQVRGT1JNKFdJTikgYW5kIE9TKFdJTikgbm8gbG9u Z2VyIG5lZWRzIHRvIGJlIHVuZGVmaW5lZCBhcworICAgICAgICB1bmRlZmluaW5nIFdJTjMyIHRh a2VzIGNhcmUgb2YgaXQuCisKKyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDoKKwogMjAxMC0wNC0w MyAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZv cm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNp b24gNTcwODUpCisrKyBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5 KQpAQCAtOTEsNiArOTEsOSBAQAogLyogQ09NUElMRVIoV0lOU0NXKSAtIENvZGVXYXJyaW9yIGZv ciBTeW1iaWFuIGVtdWxhdG9yICovCiAjaWYgZGVmaW5lZChfX1dJTlNDV19fKQogI2RlZmluZSBX VEZfQ09NUElMRVJfV0lOU0NXIDEKKy8qIGNyb3NzLWNvbXBpbGluZywgaXQgaXMgbm90IHJlYWxs eSB3aW5kb3dzICovCisjdW5kZWYgV0lOMzIKKyN1bmRlZiBfV0lOMzIKICNlbmRpZgogCiAKQEAg LTM5Nyw5ICs0MDAsNiBAQAogCiAvKiBPUyhTWU1CSUFOKSAtIFN5bWJpYW4gKi8KICNpZiBkZWZp bmVkIChfX1NZTUJJQU4zMl9fKQotLyogd2UgYXJlIGNyb3NzLWNvbXBpbGluZywgaXQgaXMgbm90 IHJlYWxseSB3aW5kb3dzICovCi0jdW5kZWYgV1RGX09TX1dJTkRPV1MKLSN1bmRlZiBXVEZfUExB VEZPUk1fV0lOCiAjZGVmaW5lIFdURl9PU19TWU1CSUFOIDEKICNlbmRpZgogCkluZGV4OiBXZWJD b3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24g NTcwODYpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3 IEBACisyMDEwLTA0LTA1ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbU3lt Ymlhbl0gQ29uc29saWRhdGUgU3ltYmlhbiBXSU5TQ1cgZW52aXJvbm1lbnQgY29uZmlndXJhdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcxMDAK KworICAgICAgICBNb3ZlIHRoZSAidW5kZWZpbml0aW9uIiBvZiBXSU4zMiBhbmQgX1dJTjMyIGZy b20gV2ViQ29yZS9jb25maWcuaAorICAgICAgICB0byBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZv cm0uaCBhcyBpdCBpcyBub3Qgc3BlY2lmaWMgdG8gV2ViQ29yZS4KKworICAgICAgICBObyBuZXcg dGVzdHMgYXMgdGhlcmUgaXMgbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBjb25m aWcuaDoKKwogMjAxMC0wNC0wNSAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZS1DaHJpc3RpYW5zZW4uCkluZGV4OiBX ZWJDb3JlL2NvbmZpZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvY29uZmlnLmgJKHJldmlzaW9u IDU3MDg1KQorKysgV2ViQ29yZS9jb25maWcuaAkod29ya2luZyBjb3B5KQpAQCAtMTcwLDggKzE3 MCw2IEBACiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogCiAjaWYgT1MoU1lNQklBTikKLSN1bmRl ZiBXSU4zMgotI3VuZGVmIF9XSU4zMgogI2RlZmluZSBVU0VfU1lTVEVNX01BTExPQyAxCiAjZW5k aWYKIAo=