diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:00:31 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:07:15 (GMT) |
commit | 8e401cd4ae0133531613a3e097acc57979d78f50 (patch) | |
tree | 58e7572913a2c0d38af6a321fc44a5566a9b859d /src/3rdparty/webkit/JavaScriptCore | |
parent | a1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d (diff) | |
parent | 732e0d01df867200546ddb5e6f8695f263e1ee0d (diff) | |
download | Qt-8e401cd4ae0133531613a3e097acc57979d78f50.zip Qt-8e401cd4ae0133531613a3e097acc57979d78f50.tar.gz Qt-8e401cd4ae0133531613a3e097acc57979d78f50.tar.bz2 |
Merge branch '4.6' of oslo-staging-1 into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index 0cbb3a5..304f9ef 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,15 @@ +2009-11-18 Harald Fernengel <harald.fernengel@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] Fix detection of linux-g++ + + Never use "linux-g++*" to check for linux-g++, since this will break embedded + builds which use linux-arm-g++ and friends. Use 'linux*-g++*' to check for any + g++ on linux mkspec. + + * JavaScriptCore.pri: + 2009-11-16 Joerg Bornemann <joerg.bornemann@trolltech.com> Reviewed by Simon Hausmann. |