diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 22:45:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 22:45:04 (GMT) |
| commit | 517d000e80c5d1c497bb21875b19285c30ef5850 (patch) | |
| tree | d22fb5fcc82314a8a354efeb9b98eb0c54b25804 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | |
| parent | 01e03e91a0c6867205f5a3ab0306f0c6a067ffad (diff) | |
| parent | 96bf7b880976f225ca390aab1cb1492e8d79ea4c (diff) | |
| download | Qt-517d000e80c5d1c497bb21875b19285c30ef5850.zip Qt-517d000e80c5d1c497bb21875b19285c30ef5850.tar.gz Qt-517d000e80c5d1c497bb21875b19285c30ef5850.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7c
Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc
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 |