summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/WebCore.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-05-14 09:25:51 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-05-14 09:25:51 (GMT)
commit96bf7b880976f225ca390aab1cb1492e8d79ea4c (patch)
tree1eacfbc1046d8e1e1dd4936cf5cc590c43817103 /src/3rdparty/webkit/WebCore/WebCore.pro
parentd6ddd9d1ba3a987b45c1718b995200421befbd0d (diff)
downloadQt-96bf7b880976f225ca390aab1cb1492e8d79ea4c.zip
Qt-96bf7b880976f225ca390aab1cb1492e8d79ea4c.tar.gz
Qt-96bf7b880976f225ca390aab1cb1492e8d79ea4c.tar.bz2
Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7c
Integrated changes: * Doc day API doc overhaul || <https://webkit.org/b/38370> || [Qt] GraphicsLayer: depth-test causes flicker in certain situations || || <https://webkit.org/b/38921> || [Qt] emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout || || <https://webkit.org/b/38863> || [Qt] Detect debug mode consistently || || <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent || || <https://webkit.org/b/39062> || [Qt] Improve QtLauncher user agent dialog resize || || <https://webkit.org/b/38841> || Ignore invalid values for various CanvasRenderingContext2D properties || || <https://webkit.org/b/38685> || [Qt] tst_QWebPage::inputMethods failing on Maemo5 || || <https://webkit.org/b/38655> || [Qt] REGRESSION(r58497) tst_QGraphicsWebView::crashOnViewlessWebPages() is failing ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
-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 254d17b..689c5ff 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -59,7 +59,7 @@ CONFIG(standalone_package) {
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
- CONFIG(debug, debug|release) {
+ !CONFIG(release, debug|release) {
OBJECTS_DIR = obj/debug
} else { # Release
OBJECTS_DIR = obj/release