diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-24 12:38:46 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-24 12:38:46 (GMT) |
| commit | cfd6a0ad8f34414f810b3d8c1a35ebdcaf756182 (patch) | |
| tree | c2cfad4aabe9dea54f22e0138c71d929cfbe7512 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | 84ce7cc25b925d493a048ce5b00290483cd974f4 (diff) | |
| parent | 20a3d8c889df2338f6edd209ca4952b9045ffb00 (diff) | |
| download | Qt-cfd6a0ad8f34414f810b3d8c1a35ebdcaf756182.zip Qt-cfd6a0ad8f34414f810b3d8c1a35ebdcaf756182.tar.gz Qt-cfd6a0ad8f34414f810b3d8c1a35ebdcaf756182.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.pri | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri index cc4a1b3..fe9e8cd 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri @@ -1,14 +1,14 @@ # JavaScriptCore - Qt4 build info VPATH += $$PWD -!CONFIG(release, debug|release) { - # Output in JavaScriptCore/<config> - JAVASCRIPTCORE_DESTDIR = debug - # Use a config-specific target to prevent parallel builds file clashes on Mac - JAVASCRIPTCORE_TARGET = jscored -} else { - JAVASCRIPTCORE_DESTDIR = release - JAVASCRIPTCORE_TARGET = jscore -} + +# Use a config-specific target to prevent parallel builds file clashes on Mac +mac: CONFIG(debug, debug|release): JAVASCRIPTCORE_TARGET = jscored +else: JAVASCRIPTCORE_TARGET = jscore + +# Output in JavaScriptCore/<config> +CONFIG(debug, debug|release) : JAVASCRIPTCORE_DESTDIR = debug +else: JAVASCRIPTCORE_DESTDIR = release + CONFIG(standalone_package) { isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/generated } else { |