Changeset 91354 in webkit

Timestamp:

Jul 20, 2011, 4:02:56 AM (15 years ago)

Author:

commit-queue@webkit.org

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.rossi@gmail.com> on 2011-07-20
Reviewed by Simon Hausmann.

• Source/WebKit.pri:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit.pri (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-07-20  Pierre Rossi  <pierre.rossi@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  <rsesek@chromium.org>
 

trunk/Source/WebKit.pri

@@ -22 +22 @@
     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