88313 2012-06-05 01:37:56 -0700 [Qt][Win] Fix build fails because of min/max macros and std::numeric_limits<*>::min/max() clashing 2012-06-13 08:18:17 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ All All RESOLVED INVALID Qt, QtTriaged P1 Blocker --- 88300 1 ossy ossy gustavo hausmann jturcotte kbalazs ossy philn xan.lopez oldest_to_newest 641309 0 ossy 2012-06-05 01:37:56 -0700 qwebframe.cpp, ... doesn't build because of this problem. 641605 1 145809 ossy 2012-06-05 08:53:48 -0700 Created attachment 145809 Patch 641621 2 145813 ossy 2012-06-05 09:07:08 -0700 Created attachment 145813 Patch Typo fixed. Thanks GTK EWS. :) 641890 3 145813 hausmann 2012-06-05 14:22:32 -0700 Comment on attachment 145813 Patch This is like a sledge-hammer :). Is it perhaps cleaner to do NOMINMAX only in those .cpp files where the clash occurs? That seems to be the more common solution and I think preferred if for example it only happens in qwebframe.cpp. 643448 4 ossy 2012-06-07 05:29:34 -0700 (In reply to comment #3) > (From update of attachment 145813 [details]) > This is like a sledge-hammer :). Is it perhaps cleaner to do NOMINMAX only in those .cpp files where the clash occurs? That seems to be the more common solution and I think preferred if for example it only happens in qwebframe.cpp. :) As far as I remember we need this for 5-10 files not only one. Let me check how many files need it. 643587 5 ossy 2012-06-07 08:52:28 -0700 problematic source files: - Source/WebKit/qt/Api/qwebview.cpp - Source/WebKit/qt/Api/gqraphicswebview.cpp - Source/WebKit/qt/Api/qwebpage.cpp - Source/WebKit/qt/Api/qwebhistory.cpp - Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp Patch is coming soon. 643598 6 146300 ossy 2012-06-07 09:08:17 -0700 Created attachment 146300 Patch Add NOMINMAX only to problematic sources instead of using sledgehammer :) 644697 7 kbalazs 2012-06-08 08:45:35 -0700 (In reply to comment #6) > Created an attachment (id=146300) [details] > Patch > > Add NOMINMAX only to problematic sources instead of using sledgehammer :) In most parts of the project we already use the sledgehammer approach. In config.h's you can find this - under #if OS(WINDOWS) // If we don't define these, they get defined in windef.h. // We want to use std::min and std::max. #ifndef max #define max max #endif #ifndef min #define min min #endif What I don't know is that which config.h is used in Source/WebKit/qt and why it does not have this. Furthermore, adding NOMINMAX seems more elegant than this ifdef hackery but I'm not sure it would work on every platform. I favor fixing it in the appropriate config.h for consistency. 646160 8 jturcotte 2012-06-11 12:13:51 -0700 WebCore/config.h is used by WebKit/qt. We "#define max max" correctly in config.h but the problem is that qdatetime.h does "#undef max" before WinDef.h gets included. How the hell did this end up in a public Qt header... 646167 9 hausmann 2012-06-11 12:22:53 -0700 (In reply to comment #8) > WebCore/config.h is used by WebKit/qt. > > We "#define max max" correctly in config.h but the problem is that qdatetime.h does "#undef max" before WinDef.h gets included. > > How the hell did this end up in a public Qt header... Well spotted!! And pretty recently changed, too: https://codereview.qt-project.org/#change,13166 The header file uses std::min/max in an inline function, but yeah, the fix is there IMHO. 646722 10 hausmann 2012-06-12 01:19:31 -0700 Work in progress at https://codereview.qt-project.org/#change,28549 - If we can't get that into Qt, then we have to change the existing workaround in WebKit to use NOMINMAX instead of #define min min/max max 646883 11 ossy 2012-06-12 06:25:05 -0700 (In reply to comment #10) > Work in progress at https://codereview.qt-project.org/#change,28549 - If we can't get that into Qt, then we have to change the existing workaround in WebKit to use NOMINMAX instead of #define min min/max max I tried it, it works for me without workaround for WebKit. ;-) 648043 12 hausmann 2012-06-13 08:17:47 -0700 (In reply to comment #11) > (In reply to comment #10) > > Work in progress at https://codereview.qt-project.org/#change,28549 - If we can't get that into Qt, then we have to change the existing workaround in WebKit to use NOMINMAX instead of #define min min/max max > > I tried it, it works for me without workaround for WebKit. ;-) Great. The change is slowly making its way into Qt. Most of the submodules are patched already and the qtbase change is staged (after the n-th try :) Let's close this as INVALID then, because the root cause for this bug is an upstream issue that disabled the existing workaround. 648045 13 146300 hausmann 2012-06-13 08:18:17 -0700 Comment on attachment 146300 Patch Clearing review 145809 2012-06-05 08:53:48 -0700 2012-06-05 09:03:53 -0700 Patch bug-88313-20120605175347.patch text/plain 1212 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDMxZTkxMzY5NjMzMmRkZjI1ZjgxN2U2 Yzg5YTMzMDAyMTE4MDNiZTcuLjAxNTY0MzIyNTUwMTUxY2M2OTgzNzhhNTIzY2JmN2Y5YjI0NzEx MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTItMDYtMDUgIENzYWJhIE9zenRyb2dvbsOhYyAg PG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdW1dpbl0gRml4IGJ1aWxkIGZhaWxzIGJl Y2F1c2Ugb2YgbWluL21heCBtYWNyb3MgYW5kIHN0ZDo6bnVtZXJpY19saW1pdHM8Kj46Om1pbi9t YXgoKSBjbGFzaGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODgzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHd0Zi9QbGF0Zm9ybS5oOiBEZWZpbmUgTk9NSU5NQVggZm9yIFF0LVdpbiBwbGF0Zm9y bSB0byBhdm9pZCBjbGFzaGVzLgorCiAyMDEyLTA2LTA0ICBUYWthc2hpIFRveW9zaGltYSAgPHRv eW9zaGltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbV2ViU29ja2V0XSBTZW5kIHJlcXVpcmVz IHN1cGVyIGxpbmVhciB0aW1lIGFnYWluc3QgZGF0YSBzaXplCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCAzODI2 YTM5Mjc4NjhmYTdhNTEwMTNmNmRiN2VlZjdkOGQwYzczODM1Li4yNTQ4YTI3MWRhYTE3ZjA0MjQy MGQ2YzJmY2Q0ZWRjNTY5YWI1ZDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKQEAgLTUxNSw2ICs1MTUsMTAgQEAK IAogI2VuZGlmICAvKiBPUyhXSU5DRSkgJiYgIVBMQVRGT1JNKFFUKSAqLwogCisjaWYgT1MoV0lO KSAmJiBQTEFURk9STShRVCkKKyNkZWZpbmUgTk9NSU5NQVggICAgICAgLyogV2luZG93cyBtaW4g YW5kIG1heCBjb25mbGljdCB3aXRoIHN0YW5kYXJkIG1hY3JvcyAqLworI2VuZGlmCisKICNpZiBQ TEFURk9STShRVCkKICNpZm5kZWYgV1RGX1VTRV9JQ1VfVU5JQ09ERQogI2RlZmluZSBXVEZfVVNF X1FUNF9VTklDT0RFIDEK 145813 2012-06-05 09:07:08 -0700 2012-06-07 09:08:10 -0700 Patch bug-88313-20120605180707.patch text/plain 1216 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDMxZTkxMzY5NjMzMmRkZjI1ZjgxN2U2 Yzg5YTMzMDAyMTE4MDNiZTcuLjAxNTY0MzIyNTUwMTUxY2M2OTgzNzhhNTIzY2JmN2Y5YjI0NzEx MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTItMDYtMDUgIENzYWJhIE9zenRyb2dvbsOhYyAg PG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdW1dpbl0gRml4IGJ1aWxkIGZhaWxzIGJl Y2F1c2Ugb2YgbWluL21heCBtYWNyb3MgYW5kIHN0ZDo6bnVtZXJpY19saW1pdHM8Kj46Om1pbi9t YXgoKSBjbGFzaGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODgzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHd0Zi9QbGF0Zm9ybS5oOiBEZWZpbmUgTk9NSU5NQVggZm9yIFF0LVdpbiBwbGF0Zm9y bSB0byBhdm9pZCBjbGFzaGVzLgorCiAyMDEyLTA2LTA0ICBUYWthc2hpIFRveW9zaGltYSAgPHRv eW9zaGltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbV2ViU29ja2V0XSBTZW5kIHJlcXVpcmVz IHN1cGVyIGxpbmVhciB0aW1lIGFnYWluc3QgZGF0YSBzaXplCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybS5oIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAppbmRleCAzODI2 YTM5Mjc4NjhmYTdhNTEwMTNmNmRiN2VlZjdkOGQwYzczODM1Li5lYzg4ZTYwNmFiYmYyY2ZiMTcy MDgyMjg4M2M5MDNmNTNiY2E5ZDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9y bS5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtLmgKQEAgLTUxNSw2ICs1MTUsMTAgQEAK IAogI2VuZGlmICAvKiBPUyhXSU5DRSkgJiYgIVBMQVRGT1JNKFFUKSAqLwogCisjaWYgT1MoV0lO RE9XUykgJiYgUExBVEZPUk0oUVQpCisjZGVmaW5lIE5PTUlOTUFYICAgICAgIC8qIFdpbmRvd3Mg bWluIGFuZCBtYXggY29uZmxpY3Qgd2l0aCBzdGFuZGFyZCBtYWNyb3MgKi8KKyNlbmRpZgorCiAj aWYgUExBVEZPUk0oUVQpCiAjaWZuZGVmIFdURl9VU0VfSUNVX1VOSUNPREUKICNkZWZpbmUgV1RG X1VTRV9RVDRfVU5JQ09ERSAxCg== 146300 2012-06-07 09:08:17 -0700 2012-06-13 08:18:17 -0700 Patch bug-88313-20120607090816.patch text/plain 3469 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDUxNGNiYTFlMWYy Yjc1MTg4MjBiNzVkMGVkOGIyMThhM2U3OWRmNmIuLjcwNDdjMTI3YjJkNGZiNzBhM2RlNTkzYTVj NDFmZjc3ZTEzMDg5YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMDYt MDcgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRd W1dpbl0gRml4IGJ1aWxkIGZhaWxzIGJlY2F1c2Ugb2YgbWluL21heCBtYWNyb3MgYW5kIHN0ZDo6 bnVtZXJpY19saW1pdHM8Kj46Om1pbi9tYXgoKSBjbGFzaGluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODgzMTMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgTk9NSU5NQVggZGVmaW5lcyB0byBhdm9p ZCBjbGFzaGVzIG9uIFF0LVdpbiBwbGF0Zm9ybS4KKworICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3 ZWJ2aWV3LmNwcDoKKyAgICAgICAgKiBBcGkvcXdlYmhpc3RvcnkuY3BwOgorICAgICAgICAqIEFw aS9xd2VicGFnZS5jcHA6CisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6CisgICAgICAg ICogQXBpL3F3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlv bkNsaWVudFF0LmNwcDoKKwogMjAxMi0wNi0wNiAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFF0IERSVCAvIFdUUiBzaG91bGQgYmUgYWJsZSB0byBs b2FkIGV4dGVybmFsIHJlc291cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkv cWdyYXBoaWNzd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2 aWV3LmNwcAppbmRleCBkMTk0ZjlmYzMwOGM4N2M0NjZjNmI0OGNjYTBjODc5MjkzNzliODc0Li43 NDY0YmMzNjQyMTg3NWI4ZjAwNGQ1MDU0OWRhNWU5NjMyMmYxOGYyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMTgsNiArMTgsOCBAQAogICAgIEJvc3Rv biwgTUEgMDIxMTAtMTMwMSwgVVNBLgogKi8KIAorI2RlZmluZSBOT01JTk1BWAorCiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAicWdyYXBoaWNzd2Vidmlldy5oIgogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2ViaGlzdG9yeS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0 L0FwaS9xd2ViaGlzdG9yeS5jcHAKaW5kZXggZmM1YmRkNWZjZWFkMjVjNTdmMGQyNjRiYzZmMTlj MGRjMmUyZGZjMC4uZDUxY2JlOWJkYjFlNjQ3MDJkMzcwNGNmMmZlZDhlNjdkODk1NmFmMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmNwcApAQCAtMTcsNiArMTcsOCBAQAogICAgIEJv c3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgogKi8KIAorI2RlZmluZSBOT01JTk1BWAorCiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAicXdlYmhpc3RvcnkuaCIKICNpbmNsdWRlICJxd2Vi aGlzdG9yeV9wLmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5j cHAgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggN2I1ZjBlMjZmY2Fh ODg1ZjMwMmI5ODhlYzQ0MzI3MzBjN2M1Y2MyMy4uNzM5OGYwZjZmMjcxNTFhMGRkMmQ1MzBhMjAx NmRhNjExZTEzNTg5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcApAQCAtMTksNiArMTks OCBAQAogICAgIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgogKi8KIAorI2RlZmluZSBOT01J Tk1BWAorCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAicXdlYnBhZ2UuaCIKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcCBiL1NvdXJjZS9X ZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKaW5kZXggNTQyNWE5MjcwNmEzM2YzOTZlNTA3 NDgxZDQ5Y2NiYjM2ZmMwNTAyYi4uOTIwMGZmNWUxNDM0YzFkMmZiYThiNzIwZDdmZjA0ODg2NzYw ZTc5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCkBAIC0xNyw2ICsxNyw4 IEBACiAgICAgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCiAqLwogCisjZGVmaW5lIE5PTUlO TUFYCisKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJxd2Vic2V0dGluZ3MuaCIKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwIGIvU291cmNlL1dl YktpdC9xdC9BcGkvcXdlYnZpZXcuY3BwCmluZGV4IDc2YmYzOTI3NzhhOTA5MTg3MzdiYTllM2U5 MDI2YmJjZjAzMTFiMWUuLmQ2YWZkMjQ3ODljNGUyMDlkYWYyMmFlNWZhMmYwNjVjOGYyOGVkNTAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKQEAgLTE5LDYgKzE5LDggQEAKICAgICBCb3N0 b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KICovCiAKKyNkZWZpbmUgTk9NSU5NQVgKKwogI2luY2x1 ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgInF3ZWJ2aWV3LmgiCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0dlb2xvY2F0aW9uQ2xpZW50UXQuY3BwCmluZGV4 IGVjNGQxYmI5ZTlhZmMzZjdhMDkwOWRjNWU0OGU1MTg3YWNmMTcyNGIuLjZhMjc5MzE5Y2Q4Mzll NmUyNDRiYjFmMWJmNWNhNWQ4MzYxOGUzMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvR2VvbG9jYXRpb25DbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9HZW9sb2NhdGlvbkNsaWVudFF0LmNwcApAQCAtMjMsNiArMjMs OCBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4gCiAgKi8KIAorI2RlZmluZSBOT01JTk1BWAorCiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiR2VvbG9jYXRpb25DbGllbnRRdC5oIgogCg==