Title: [91354] trunk
- Revision
- 91354
- Author
- commit-qu...@webkit.org
- Date
- 2011-07-20 04:02:56 -0700 (Wed, 20 Jul 2011)
Log Message
[Qt] Qt5 Build Fix: Disable the legacy mac assert macros.
This is done in order to prevent collision with the recently
introduced function QSslCertificate::verify() in Qt5.
https://bugs.webkit.org/show_bug.cgi?id=64855
Patch by Pierre Rossi <pierre.ro...@gmail.com> on 2011-07-20
Reviewed by Simon Hausmann.
* Source/WebKit.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (91353 => 91354)
--- trunk/ChangeLog 2011-07-20 10:23:42 UTC (rev 91353)
+++ trunk/ChangeLog 2011-07-20 11:02:56 UTC (rev 91354)
@@ -1,3 +1,16 @@
+2011-07-20 Pierre Rossi <pierre.ro...@gmail.com>
+
+ [Qt] Qt5 Build Fix: Disable the legacy mac assert macros.
+
+ This is done in order to prevent collision with the recently
+ introduced function QSslCertificate::verify() in Qt5.
+
+ https://bugs.webkit.org/show_bug.cgi?id=64855
+
+ Reviewed by Simon Hausmann.
+
+ * Source/WebKit.pri:
+
2011-07-19 Robert Sesek <rse...@chromium.org>
[Chromium] Need to remove app/ from DEPS
Modified: trunk/Source/WebKit.pri (91353 => 91354)
--- trunk/Source/WebKit.pri 2011-07-20 10:23:42 UTC (rev 91353)
+++ trunk/Source/WebKit.pri 2011-07-20 11:02:56 UTC (rev 91354)
@@ -21,6 +21,8 @@
# Make sure that build_all follows the build_all config in WebCore
mac:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework):!build_pass:CONFIG += build_all
}
+#We don't want verify and other platform macros to pollute the namespace
+mac: DEFINES += __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
CONFIG(standalone_package): DEFINES *= NDEBUG
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
