diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-21 14:25:39 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-21 14:25:39 (GMT) |
| commit | 33ccc95da472e2932514e3df43ffc1df33855ded (patch) | |
| tree | faeee0bf3ad3dc1a5b46f847ef4d3f7c86204c82 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | 4bc894400ffb4ad07babe9b45ed53ceb2d986418 (diff) | |
| download | Qt-33ccc95da472e2932514e3df43ffc1df33855ded.zip Qt-33ccc95da472e2932514e3df43ffc1df33855ded.tar.gz Qt-33ccc95da472e2932514e3df43ffc1df33855ded.tar.bz2 | |
Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd
Integrated changes:
|| <https://webkit.org/b/6274> || text repainting does not account for glyphs which draw outside the typographic bounds of the font ||
|| <https://webkit.org/b/40840> || [Qt] Symbian builds in release sometimes try to link with the debug JavaScriptCore static lib. ||
|| <https://webkit.org/b/40620> || [Qt] Get rid of the the unused imageSize of ImageDecoderQt::internalHandleCurrentImage() ||
|| <https://webkit.org/b/37292> || http://trac.webkit.org/changeset/57215 caused perf regressions ||
|| <https://webkit.org/b/40077> || [Qt] Implement the simple font code path. ||
|| <https://webkit.org/b/40910> || [Qt] Avoid unnecessary image conversion in RGBA32Buffer::zeroFill() ||
|| <https://webkit.org/b/40797> || [Qt] Decode images directly to QPixmap ||
|| <https://webkit.org/b/36510> || [chromium] use integral glyph widths ||
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 { |