diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-19 08:45:52 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-19 08:45:52 (GMT) |
| commit | 9547ade2b9cd7c792d98bf06ca8de89c9e560396 (patch) | |
| tree | aa43069092eaaa2078c21c86347c28e3ac41c574 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| parent | fa608f9094591c146f9170ba485ea2e4d7827dca (diff) | |
| parent | cbb28a77cb295b74d47a5a1923357dd6557bea84 (diff) | |
| download | Qt-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.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 |