diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-09 09:04:33 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-09 09:04:33 (GMT) |
| commit | 0d288fa2112a00ecd8e160dd6ff70ba2e54153ee (patch) | |
| tree | 8e809671877131840436d4a221e7ed63f4dea6dd /src | |
| parent | b789e09d2dac82e474f0e706a7cef4c943ce1753 (diff) | |
| download | Qt-0d288fa2112a00ecd8e160dd6ff70ba2e54153ee.zip Qt-0d288fa2112a00ecd8e160dd6ff70ba2e54153ee.tar.gz Qt-0d288fa2112a00ecd8e160dd6ff70ba2e54153ee.tar.bz2 | |
Fix failing assertions in debug builds
Cherry-pick of http://trac.webkit.org/changeset/57320
Don't mix NDEBUG and DEBUG between JSC and WebCore.
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 1 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit.pri | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri index edc4c6f..902e6f3 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri @@ -13,6 +13,8 @@ CONFIG(standalone_package) { isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = generated } +CONFIG(standalone_package): DEFINES *= NDEBUG + symbian: { # Need to guarantee this comes before system includes of /epoc32/include MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler" diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index f0fae81..714b021 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -52,7 +52,6 @@ CONFIG(standalone_package) { isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h - DEFINES *= NDEBUG symbian: TARGET += $${QT_LIBINFIX} } else { diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index e737039..662932c 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri @@ -43,10 +43,6 @@ greaterThan(QT_MINOR_VERSION, 5):DEFINES += WTF_USE_ACCELERATED_COMPOSITING DEFINES += USE_SYSTEM_MALLOC } -CONFIG(release, debug|release) { - DEFINES += NDEBUG -} - BASE_DIR = $$PWD INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit |