[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
vestbo at webkit.org
vestbo at webkit.org
Wed Apr 7 23:19:22 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 28ae01f3f7cc2f598a98b6ae16023f5a3e1de71e
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 3 11:50:57 2009 +0000
[Qt] Build fix for Mac OS X when building as framework
WTFReportAssertionFailure is not exported, so building DRT in debug
mode against QtWebKit built as a framework failes to link.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
index 10a3e41..73b8639 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
@@ -1,6 +1,11 @@
TARGET = DumpRenderTree
CONFIG -= app_bundle
+mac:!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
+ CONFIG -= debug
+ CONFIG += release
+}
+
BASEDIR = $$PWD/../
include(../../../WebKit.pri)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list