summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-05-19 08:45:52 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-05-19 08:45:52 (GMT)
commit9547ade2b9cd7c792d98bf06ca8de89c9e560396 (patch)
treeaa43069092eaaa2078c21c86347c28e3ac41c574 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
parentfa608f9094591c146f9170ba485ea2e4d7827dca (diff)
parentcbb28a77cb295b74d47a5a1923357dd6557bea84 (diff)
downloadQt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.zip
Qt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.tar.gz
Qt-9547ade2b9cd7c792d98bf06ca8de89c9e560396.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index b7f6665..b3f74a9 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -1,6 +1,6 @@
# JavaScriptCore - Qt4 build info
VPATH += $$PWD
-CONFIG(debug, debug|release) {
+!CONFIG(release, debug|release) {
# Output in JavaScriptCore/<config>
JAVASCRIPTCORE_DESTDIR = debug
# Use a config-specific target to prevent parallel builds file clashes on Mac