diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-05-19 09:33:21 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-05-19 09:33:21 (GMT) |
| commit | ebe28bdd77ca615c47ebf6b41e34aee0c154fcf9 (patch) | |
| tree | a1aa1578f798bae0cc23c32656134628bf5af788 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| parent | 109024630cbf577d6f6bcb10ea3ac6272113b79e (diff) | |
| parent | 28b894f65c5aba01d5ee80c20f617478faaee7e7 (diff) | |
| download | Qt-ebe28bdd77ca615c47ebf6b41e34aee0c154fcf9.zip Qt-ebe28bdd77ca615c47ebf6b41e34aee0c154fcf9.tar.gz Qt-ebe28bdd77ca615c47ebf6b41e34aee0c154fcf9.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.pro')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro index 8e086b3..22fcc91 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro @@ -21,7 +21,7 @@ CONFIG(QTDIR_build) { # This line was extracted from qbase.pri instead of including the whole file win32|mac:!macx-xcode:CONFIG += debug_and_release } else { - CONFIG(debug, debug|release) { + !CONFIG(release, debug|release) { OBJECTS_DIR = obj/debug } else { # Release OBJECTS_DIR = obj/release |