summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-20 23:35:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-20 23:35:41 (GMT)
commit20b79761dcd9330eb068e8cfcb7d7fc89ed24dfb (patch)
tree88707fa4e27250b3e254b5b607fad34a28c0b998 /src
parent660ec910ef60513b511e2292255e53701dbb239b (diff)
parent9e5a1b618ea7bf579c7b2d66a8844d606405bc6d (diff)
downloadQt-20b79761dcd9330eb068e8cfcb7d7fc89ed24dfb.zip
Qt-20b79761dcd9330eb068e8cfcb7d7fc89ed24dfb.tar.gz
Qt-20b79761dcd9330eb068e8cfcb7d7fc89ed24dfb.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Enable building Qt/Webkit with debug symbols Add breakpad support
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 5f688f3..6b21d8a 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -2952,7 +2952,7 @@ HEADERS += $$WEBKIT_API_HEADERS
}
}
-CONFIG(QTDIR_build) {
+!CONFIG(webkit-debug):CONFIG(QTDIR_build) {
# Remove the following 2 lines if you want debug information in WebCore
CONFIG -= separate_debug_info
CONFIG += no_debug_info