44124 2010-08-17 12:39:09 -0700 [Qt] [Symbian] Consistently use Q_OS_SYMBIAN to guard all Symbian platform dependencies 2010-08-24 06:02:35 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC S60 3rd edition RESOLVED FIXED Qt P2 Normal --- 1 laszlo.gombos webkit-unassigned commit-queue hausmann oldest_to_newest 265702 0 laszlo.gombos 2010-08-17 12:39:09 -0700 Q_WS_S60 is not going to be defined for Symbian^4 devices as Q_WS_S60 used to guard Avkon UI framework dependencies (see http://doc.qt.nokia.com/4.7-snapshot/qtglobal.html#Q_WS_S60). Going trough all the usage of Q_WS_S60 in WebKit I have found that all of them really should have been Q_OS_SYMBIAN. Patch will follow. 265707 1 64622 laszlo.gombos 2010-08-17 12:49:21 -0700 Created attachment 64622 proposed patch 265855 2 64622 ariya.hidayat 2010-08-17 17:03:41 -0700 Comment on attachment 64622 proposed patch re=me 265888 3 64622 commit-queue 2010-08-17 18:22:34 -0700 Comment on attachment 64622 proposed patch Clearing flags on attachment: 64622 Committed r65581: <http://trac.webkit.org/changeset/65581> 265889 4 commit-queue 2010-08-17 18:22:39 -0700 All reviewed patches have been landed. Closing bug. 268504 5 hausmann 2010-08-24 06:02:24 -0700 Revision r65581 cherry-picked into qtwebkit-2.1 with commit cb830f8e78d51660cf665b1feed2c90ac942210e 64622 2010-08-17 12:49:21 -0700 2010-08-17 18:22:34 -0700 proposed patch 44124.patch text/plain 5978 laszlo.gombos SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjU1MzApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDgtMTcgIExhc3psbyBHb21ib3MgIDxsYXN6bG8u MS5nb21ib3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF0gW1N5bWJpYW5dIENvbnNpc3RlbnRseSB1c2UgUV9PU19TWU1CSUFO IHRvIGd1YXJkIGFsbCBTeW1iaWFuIHBsYXRmb3JtIGRlcGVuZGVuY2llcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQxMjQKKworICAgICAgICBRX1dT X1M2MCBpcyBub3QgZGVmaW5lZCBmb3IgU3ltYmlhbl40IGRldmljZXMgYXMgUV9XU19TNjAgdXNl ZCB0byBndWFyZAorICAgICAgICBBdmtvbiBVSSBmcmFtZXdvcmsgZGVwZW5kZW5jaWVzLiBVc2Ug UV9PU19TWU1CSUFOIGV2ZXJ5d2hlcmUgdG8gbWFyaworICAgICAgICBTeW1iaWFuIGRlcGVuZGVu Y2llcy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpRdEZhbGxiYWNrV2ViUG9wdXA6OnBvcHVsYXRlKToKKwogMjAx MC0wOC0xNyAgSHVpIEh1YW5nICA8aHVpLjIuaHVhbmdAbm9raWEuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IExhc3psbyBHb21ib3MuCkluZGV4OiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv UXRGYWxsYmFja1dlYlBvcHVwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmNwcAkocmV2aXNpb24gNjU1MjApCisrKyBXZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvUXRGYWxsYmFja1dlYlBvcHVwLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjE1LDcgKzIxNSw3IEBAIHZvaWQgUXRGYWxsYmFja1dlYlBvcHVwOjpwb3B1bGF0ZShjb25z dCAKICAgICBRU3RhbmRhcmRJdGVtTW9kZWwqIG1vZGVsID0gcW9iamVjdF9jYXN0PFFTdGFuZGFy ZEl0ZW1Nb2RlbCo+KG1fY29tYm8tPm1vZGVsKCkpOwogICAgIFFfQVNTRVJUKG1vZGVsKTsKIAot I2lmICFkZWZpbmVkKFFfV1NfUzYwKQorI2lmICFkZWZpbmVkKFFfT1NfU1lNQklBTikKICAgICBt X2NvbWJvLT5zZXRGb250KGZvbnQoKSk7CiAjZW5kaWYKIApJbmRleDogV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gNjU1 MzApCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwy NiBAQAorMjAxMC0wOC0xNyAgTGFzemxvIEdvbWJvcyAgPGxhc3psby4xLmdvbWJvc0Bub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBbU3ltYmlhbl0gQ29uc2lzdGVudGx5IHVzZSBRX09TX1NZTUJJQU4gdG8gZ3VhcmQgYWxsIFN5 bWJpYW4gcGxhdGZvcm0gZGVwZW5kZW5jaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00NDEyNAorCisgICAgICAgIFFfV1NfUzYwIGlzIG5vdCBkZWZp bmVkIGZvciBTeW1iaWFuXjQgZGV2aWNlcyBhcyBRX1dTX1M2MCB1c2VkIHRvIGd1YXJkIAorICAg ICAgICBBdmtvbiBVSSBmcmFtZXdvcmsgZGVwZW5kZW5jaWVzLiBVc2UgUV9PU19TWU1CSUFOIGV2 ZXJ5d2hlcmUgdG8gbWFyaworICAgICAgICBTeW1iaWFuIGRlcGVuZGVuY2llcy4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RHVtcFJlbmRlclRyZWU6Om9wZW4pOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1 bmNoZXJ3aW5kb3cuY3BwOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmluaXQpOgorICAgICAg ICAoTGF1bmNoZXJXaW5kb3c6OnRvZ2dsZUZ1bGxTY3JlZW5Nb2RlKToKKyAgICAgICAgKExhdW5j aGVyV2luZG93OjpzaG93RlBTKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp1cGRhdGVGUFMp OgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKFdp bmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFp bndpbmRvdy5jcHA6CisgICAgICAgIChNYWluV2luZG93OjpidWlsZFVJKToKKwogMjAxMC0wOC0x NyAgVmljdG9yIFdhbmcgIDx2aWN0b3J3QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBvamFuQGNocm9taXVtLm9yZy4KSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0R1bXBS ZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCShyZXZpc2lvbiA2NTUyMCkKKysrIFdl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01NzEsNyArNTcxLDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6b3Blbihjb25z dCBRVXJsJiB1cgogICAgIG1fcGFnZS0+ZXZlbnQoJmV2KTsKIAogICAgIFFXZWJTZXR0aW5nczo6 Y2xlYXJNZW1vcnlDYWNoZXMoKTsKLSNpZiAhKGRlZmluZWQoUV9XU19TNjApICYmIFFUX1ZFUlNJ T04gPD0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAyKSkKKyNpZiAhKGRlZmluZWQoUV9PU19TWU1C SUFOKSAmJiBRVF9WRVJTSU9OIDw9IFFUX1ZFUlNJT05fQ0hFQ0soNCwgNiwgMikpCiAgICAgUUZv bnREYXRhYmFzZTo6cmVtb3ZlQWxsQXBwbGljYXRpb25Gb250cygpOwogI2VuZGlmCiAjaWYgZGVm aW5lZChRX1dTX1gxMSkKSW5kZXg6IFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3 aW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNo ZXJ3aW5kb3cuY3BwCShyZXZpc2lvbiA2NTUyMCkKKysrIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dz ZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NSw3ICs2NSw3IEBAIHZv aWQgTGF1bmNoZXJXaW5kb3c6OmluaXQoKQogICAgIFFTcGxpdHRlciogc3BsaXR0ZXIgPSBuZXcg UVNwbGl0dGVyKFF0OjpWZXJ0aWNhbCwgdGhpcyk7CiAgICAgc2V0Q2VudHJhbFdpZGdldChzcGxp dHRlcik7CiAKLSNpZiBkZWZpbmVkKFFfV1NfUzYwKQorI2lmIGRlZmluZWQoUV9PU19TWU1CSUFO KQogICAgIHNldFdpbmRvd1N0YXRlKFF0OjpXaW5kb3dNYXhpbWl6ZWQpOwogI2Vsc2UKICAgICBz ZXRXaW5kb3dTdGF0ZShRdDo6V2luZG93Tm9TdGF0ZSk7CkBAIC03MTMsNyArNzEzLDcgQEAgdm9p ZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlRnVsbFNjcmVlbk1vZAogICAgIGlmIChlbmFibGUpCiAg ICAgICAgIHNldFdpbmRvd1N0YXRlKFF0OjpXaW5kb3dGdWxsU2NyZWVuKTsKICAgICBlbHNlIHsK LSNpZiBkZWZpbmVkKFFfV1NfUzYwKQorI2lmIGRlZmluZWQoUV9PU19TWU1CSUFOKQogICAgICAg ICBzZXRXaW5kb3dTdGF0ZShRdDo6V2luZG93TWF4aW1pemVkKTsKICNlbHNlCiAgICAgICAgIHNl dFdpbmRvd1N0YXRlKFF0OjpXaW5kb3dOb1N0YXRlKTsKQEAgLTc3MSw3ICs3NzEsNyBAQCB2b2lk IExhdW5jaGVyV2luZG93OjpzaG93RlBTKGJvb2wgZW5hYmxlCiAgICAgdmlldy0+c2V0RnJhbWVS YXRlTWVhc3VyZW1lbnRFbmFibGVkKGVuYWJsZSk7CiAKICAgICBpZiAoIWVuYWJsZSkgewotI2lm IGRlZmluZWQoUV9XU19NQUVNT181KSAmJiBkZWZpbmVkKFFfV1NfUzYwKQorI2lmIGRlZmluZWQo UV9XU19NQUVNT181KSAmJiBkZWZpbmVkKFFfT1NfU1lNQklBTikKICAgICAgICAgc2V0V2luZG93 VGl0bGUoIiIpOwogI2Vsc2UKICAgICAgICAgc3RhdHVzQmFyKCktPmNsZWFyTWVzc2FnZSgpOwpA QCAtODMwLDcgKzgzMCw3IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnVwZGF0ZUZQUyhpbnQgZnBz KQogewogICAgIFFTdHJpbmcgZnBzU3RhdHVzVGV4dCA9IFFTdHJpbmcoIkN1cnJlbnQgRlBTOiAl MSIpLmFyZyhmcHMpOwogCi0jaWYgZGVmaW5lZChRX1dTX01BRU1PXzUpICYmIGRlZmluZWQoUV9X U19TNjApCisjaWYgZGVmaW5lZChRX1dTX01BRU1PXzUpICYmIGRlZmluZWQoUV9PU19TWU1CSUFO KQogICAgIHNldFdpbmRvd1RpdGxlKGZwc1N0YXR1c1RleHQpOwogI2Vsc2UKICAgICBzdGF0dXNC YXIoKS0+c2hvd01lc3NhZ2UoZnBzU3RhdHVzVGV4dCk7CkluZGV4OiBXZWJLaXRUb29scy9RdFRl c3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvUXRU ZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCShyZXZpc2lvbiA2NTUyMCkKKysrIFdlYktpdFRv b2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAkod29ya2luZyBjb3B5KQpAQCAtODIs NyArODIsNyBAQCBwdWJsaWM6CiAgICAgICAgICwgdXNlQ29tcG9zaXRpbmcodHJ1ZSkKICAgICAg ICAgLCB1c2VUaWxlZEJhY2tpbmdTdG9yZShmYWxzZSkKICAgICAgICAgLCB1c2VXZWJHTChmYWxz ZSkKLSNpZiBkZWZpbmVkKFFfV1NfTUFFTU9fNSkgfHwgZGVmaW5lZChRX1dTX1M2MCkKKyNpZiBk ZWZpbmVkKFFfV1NfTUFFTU9fNSkgfHwgZGVmaW5lZChRX09TX1NZTUJJQU4pCiAgICAgICAgICwg dXNlRnJhbWVGbGF0dGVuaW5nKHRydWUpCiAjZWxzZQogICAgICAgICAsIHVzZUZyYW1lRmxhdHRl bmluZyhmYWxzZSkKSW5kZXg6IFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbndpbmRvdy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9tYWlud2luZG93LmNw cAkocmV2aXNpb24gNjU1MjApCisrKyBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL21haW53aW5k b3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OCw3ICs0OCw3IEBAIE1haW5XaW5kb3c6Ok1haW5X aW5kb3coY29uc3QgUVN0cmluZyYgdXIKIHZvaWQgTWFpbldpbmRvdzo6YnVpbGRVSSgpCiB7CiAg ICAgUVRvb2xCYXIqIGJhciA9IGFkZFRvb2xCYXIoIk5hdmlnYXRpb24iKTsKLSNpZiBkZWZpbmVk KFFfV1NfUzYwKQorI2lmIGRlZmluZWQoUV9PU19TWU1CSUFOKQogICAgIGJhci0+c2V0SWNvblNp emUoUVNpemUoMTYsIDE2KSk7CiAjZW5kaWYKICAgICBRQWN0aW9uKiByZWxvYWRBY3Rpb24gPSBw YWdlKCktPmFjdGlvbihRV2ViUGFnZTo6UmVsb2FkKTsKQEAgLTY1LDcgKzY1LDcgQEAgdm9pZCBN YWluV2luZG93OjpidWlsZFVJKCkKICAgICBRQ29tcGxldGVyKiBjb21wbGV0ZXIgPSBuZXcgUUNv bXBsZXRlcih0aGlzKTsKICAgICB1cmxFZGl0LT5zZXRDb21wbGV0ZXIoY29tcGxldGVyKTsKICAg ICBjb21wbGV0ZXItPnNldE1vZGVsKCZ1cmxNb2RlbCk7Ci0jaWYgZGVmaW5lZChRX1dTX1M2MCkK KyNpZiBkZWZpbmVkKFFfT1NfU1lNQklBTikKICAgICBhZGRUb29sQmFyQnJlYWsoKTsKICAgICBh ZGRUb29sQmFyKCJMb2NhdGlvbiIpLT5hZGRXaWRnZXQodXJsRWRpdCk7CiAjZWxzZQo=