summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Fix a possible crash with the EVR video renderer in windowsThierry Bastian2010-06-181-7/+9
| | | | | | | This can happn when the component can be instanciated but not all the services are available on it. The code is now more robust. Reviewed-By: gabi
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-163-10/+29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added more DITA output to the XML generator Defer allocation of GIF decoding tables/stack. Make sure only started gestures can cause cancellations Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 ) qmake: Fix CONFIG += exceptions_off with the MSVC project generator. Fix some kind of race condition while using remote commands. Work around ICE in Intel C++ Compiler 11.1.072 Reduce the memory consumption of QtFontStyle
| * Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-06-163-10/+29
| | | | | | | | | | | | | | | | to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 ) Integrated changes: || <https://webkit.org/b/37195> || JSC's currentThreadStackBase is not reentrant on some platforms
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1623-224/+507
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/harfbuzz/src/harfbuzz-shaper.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-06-165-20/+52
| | | | | | | | | | | | | | | | ( 7932e8da6bfdeff653c572c22aed879c8c308829 ) Changes in WebKit/qt since the last update: * https://bugs.webkit.org/show_bug.cgi?id=39857 -- GIFs loop one time too few
| * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-161-1/+1
| | | | | | | | | | | | | | 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52 Includes Andreas' MSVC fix and fixes the RVCT build by temporarily disabling the structure packing.
| * Buildfix for MSVC2008 (C90 violation)Andreas Kling2010-06-151-2/+4
| |
| * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-1523-180/+912
| | | | | | | | | | | | | | 1313dc84678c74f1c24f910f702d7ed27a417607 This includes Andreas' changes to reduce the memory usage by packing and re-odering data structures as well as Lars' greek shaper.
| * Fix issues with thai line breakingLars Knoll2010-06-144-57/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge latest harfbuzz: commit cce760d41f115fecd5b9b6b20b62883b10a9c204 Author: Lars Knoll <lars.knoll@nokia.com> Date: Mon Jun 14 14:14:59 2010 +0200 Fixes for thai linebreaking * Load libthai.so.0 since libthai.so is not there on all systems * Remove dependency on codecs. Unicode->TIS620 is so simple we can simply hardcode it in harbuzz-thai.c * Speed up detection of word boundaries * Falback when libthai is not found is now to not break instead of breaking after every character (in line with recommendations from unicode.org linebreaking algorithm) Reviewed-by: Simon Hausmann Adapt qharfbuzz.cpp to the changes in harfbuzz. Reviewed-by: Simon Hausmann
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-06-103-29/+68
| | | | | | | | | | | | | | | | ( d8a9d09376a47b92ea49f1a078c392cbfdbc0ed6 ) Changes in WebKit/qt since the last update: * https://bugs.webkit.org/show_bug.cgi?id=39958 -- [Qt] TextBreakIterator Qt performance
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-155-6/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits) Use native locale aware string comparison on Symbian. Temporary fix for regression in QSslCertificate::fromPath() doc: Added more DITA output to the XML generator Fix symbian building of TARGET with a slash Fix a minor typo in QAbstractItemModel's documentation. QXmlSchema: allow usage of xsd:all QSslSocket: fix build for MinGW and VS 2005 Fix symbian-abld build failure with bearer plugins remove certificate bundle make QSslSocket::systemCaCertificates() use system certs Adjusted RegExp in QSslCertificate::fromPath() Fix QSystemTrayIcon::supportsMessages() on Windows Use NIM_SETVERSION to get the latest behavior Cleanup obsolete stuff doc: Added DITA XML generator Fixed a broken merge. Changed the way we detect touch screen on Windows. Fixed error deploying qsymbianbearer.qtplugin on Symbian. Revert "Attempt to fix build failure on Symbian." Attempt to fix build failure on Symbian. ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-145-6/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) Fix symbian-abld build failure with bearer plugins remove certificate bundle make QSslSocket::systemCaCertificates() use system certs Adjusted RegExp in QSslCertificate::fromPath() Fix QSystemTrayIcon::supportsMessages() on Windows Use NIM_SETVERSION to get the latest behavior Cleanup obsolete stuff doc: Added DITA XML generator Fixed a broken merge. Changed the way we detect touch screen on Windows. Fixed error deploying qsymbianbearer.qtplugin on Symbian. Revert "Attempt to fix build failure on Symbian." Attempt to fix build failure on Symbian. Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else" Updated leading whitespace to make indentation more consistent Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms. make postgresql support sensitive to PSQL_LIBS support for cross building Qt for MinGW (win32-g++) on Unix use "win32-g++*" scope to match all MinGW makespecs Demos: Fix compilation with namespace. ...
| | * | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-105-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbfSimon Hausmann2010-06-155-9/+17
|/ / / | | | | | | | | | | | | | | | Integrated fix: || <https://webkit.org/b/40487> || [Qt] The qt_webkit_version.pri file gets overwritten on install ||
* | | Updated WebKit to f943ead2759537527faa7f3cb057d995291663b9Simon Hausmann2010-06-1316-154/+450
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/31779> || QWebPage::findText() does not clear selection when passed empty string || || <https://webkit.org/b/37316> || [Qt] tests/hybridPixmap fails || || <https://webkit.org/b/40359> || [Qt] Imperfect dependency for generated SVGNames.cpp || || <https://webkit.org/b/40490> || [Qt] Typo error in QWebPluginFactory Documentation || || <https://webkit.org/b/40401> || REGRESSION: [Qt] When dragging onto a page that handles the drag in Javascript it will be a move and not a copy by default || || <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge || || <https://webkit.org/b/39958> || [Qt] TextBreakIteratorQt performance || || <https://webkit.org/b/40535> || [Qt] GraphicsLayer: recaching images creates an unnecessary deep copy || || <https://webkit.org/b/36569> || SQLStatementErrorCallback's return value needs to be converted to a boolean || || <https://webkit.org/b/39357> || [QT] QT_BEARER flag is not enabled on S60 properly ||
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-086-2/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-06-043-6/+40
| | | | | | | | | | | | | | | | | | | | ( d6d6c3821ed111b214a753f1ce8fa969c1a94dc3 ) Changes in WebKit/qt since the last update: * https://bugs.webkit.org/show_bug.cgi?id=36832 -- [Qt] Destroy SharedTimerQt before destruction of QCoreApplication. Task-number: QT-3393
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-036-2/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed compiler warnings Window visibility changes update TLW backing store reference count Enable visibility change events on all Symbian native windows Added reference counting to QWidgetBackingStore Added tst_QWidget::destroyBackingStoreWhenHidden
| | * Removed compiler warningsGareth Stockwell2010-06-026-2/+14
| | | | | | | | | | | | | | | | | | Emitted when building with MetroWerks x86 toolchain. Reviewed-by: trustme
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-05-313-2/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-05-19 Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed by Kenneth Rohde Christiansen. When creating the UA, do not sassmue the language code is a two-letter iso639-1 code. * Api/qwebpage.cpp: (QWebPage::userAgentForUrl):
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-05-302-12/+28
| | | | | | | | | | | | | | | | ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab ) Changes in WebKit/qt since the last update: * [Qt] Update the Symbian version for the user agent -- https://bugs.webkit.org/show_bug.cgi?id=38389
| * QTBUG-5955: Qt fails to build on alpha architectureFathi Boudra2010-05-251-1/+6
| | | | | | | | | | | | | | | | - add alpha platform support based on JavaScriptCore from src/3rdparty/webkit copy. - fix invalid type conversions on alpha architecture. Merge-request: 640 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-05-217-17/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | ( ecee9d7244ce4f7e7acf723bcef535532780db5f ) Changes in WebKit/qt since the last update: * [Qt] Nested overflow div does not scroll https://bugs.webkit.org/show_bug.cgi?id=38641 * [Qt] Non animated gifs are animated in QtWebKit https://bugs.webkit.org/show_bug.cgi?id=35955 * [Qt] startAnimation() is not needed to preceede nativeImageForCurrentFrame() https://bugs.webkit.org/show_bug.cgi?id=37844 * Animated GIF images does not animate 10x as expected by default. https://bugs.webkit.org/show_bug.cgi?id=36818 Plus updated/fixed def files
* | Updated WebKit to 6db5de6d18c3ab8b74809303e4d79abacfc570a8Simon Hausmann2010-06-0719-12/+180
| | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/31403> || [Qt] Disable pthread_setname_np. || || <https://webkit.org/b/38324> || [Qt] Fix compilation with QT_NO_FEATURE || || <https://webkit.org/b/40221> || REGRESSION(r60169): [Qt] Selected text is not drawn with the correct color. ||
* | Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647Simon Hausmann2010-06-044-4/+20
| | | | | | | | || <https://webkit.org/b/40116> || [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed ||
* | Updated WebKit to de1e909b06cbc981d63e0fc0f6a3f84002dd1e80Simon Hausmann2010-06-0416-18/+650
| | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/39694> || [Qt] GraphicsLayer: warnings when reloading page || || <https://webkit.org/b/38762> || [Qt] Flash Plugin is not working on mac-cocoa-32 || || <https://webkit.org/b/39918> || REGRESSION(58615): Scroll events are sent twice per keypress for ports that don't have a platformWidget scrollbar || || <https://webkit.org/b/26224> || [Qt, Gtk] Allows build-webkit script to receive an install prefix as parameter || || <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge || || <https://webkit.org/b/33176> || [Qt] The FIRST letter in the PASSWORD field is taken in UPPERCASE by DEFAULT in gmail.com web page ||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-0312-22/+153
|\ \ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 9a83f22bc41a2016b6bbf495bfd32b3a659038c8 Fix versioning of pkg files on Symbian for apps linking against WebKit Updated WebKit to f59a934694947496cedecc5256a71bff60c43c4c
| * | Updated WebKit to 9a83f22bc41a2016b6bbf495bfd32b3a659038c8Simon Hausmann2010-06-0110-18/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/36826> || [Qt] QtWebkit.pc is broken || || <https://webkit.org/b/39189> || Bring CanvasRenderingContext2D's createImageData() in line with HTML5 spec || || <https://webkit.org/b/39175> || Properly handle invalid arguments to CanvasRenderingContext2D's getImageData() and putImageData() || As well as fixes for the qt_webkit_version.pri module installation.
| * | Updated WebKit to f59a934694947496cedecc5256a71bff60c43c4cSimon Hausmann2010-06-016-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/36826> || [Qt] QtWebkit.pc is broken || Plus a fix for the installation/setup of qt_webkit_version.pri
* | | Fix QML crashes on the N900Simon Hausmann2010-06-011-0/+8
|/ / | | | | | | | | | | | | JavaScriptCore and QtWebKit JIT symbols were clashing. Hide the new thunk functions that DEFINE_STUB_FUNCTION declares. Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
* | Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4Simon Hausmann2010-05-318-8/+39
| | | | | | | | Integrate https://trac.webkit.org/changeset/60435 - [Qt] Escape backslashes in the .pro files by Ossi.
* | Updated WebKit to 531b0d7cd2af830f0d17b83b6e4a489794481539Simon Hausmann2010-05-3010-11/+202
| | | | | | | | | | | | | | | | Fixes integrated: || <https://webkit.org/b/39784> || [Qt] REGRESSION(r59837): Incorrect clipping of TransparencyLayers || || <https://webkit.org/b/39874> || [Qt] Make tiled backing store more configurable || || <https://webkit.org/b/29899> || [Qt] Add a way to stop delayed redirect requests ||
* | Updated WebKit to eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7Simon Hausmann2010-05-2915-74/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes integrated: || <https://webkit.org/b/39488> || [Qt] QtTestBrowser is still called QtLauncher in the code || || <https://webkit.org/b/38722> || [Qt] qwebframe auto test doesn't compile || || <https://webkit.org/b/39491> || [Qt] QtTestBrowser has two graphicsview options that aren't enabled correctly || || <https://webkit.org/b/39063> || [Qt] Tiled backing store checker pattern does not paint correctly when scaling factor is not 1 || || <https://webkit.org/b/39217> || Add an optional "starting node' parameter to scrollRecursively and scrollOverflow of EventHandler || || <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent || || <https://webkit.org/b/35702> || [Qt] Add more support for InputTextController || || <https://webkit.org/b/39513> || [Qt] Using Accelerated Composing the rocket back animation on http://www.the-art-of-web.com/css/css-animation/ works differently as when not using AC. || || <https://webkit.org/b/39609> || [Qt] Running with accelerated compositing enabled sometimes result in a crash || Plus autotest fix.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2831-102/+594
|\ \ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 807157e42add842605ec67d9363dd3f1861748ca
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2731-102/+594
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 807157e42add842605ec67d9363dd3f1861748ca
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2531-102/+594
| | |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 807157e42add842605ec67d9363dd3f1861748ca
| | | * | Updated WebKit to 807157e42add842605ec67d9363dd3f1861748caSimon Hausmann2010-05-2531-102/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changes integrated: || <https://webkit.org/b/24289> || [Qt] lacks clipToImageBuffer() || || <https://webkit.org/b/38641> || [Qt] Nested overflow div does not scroll || || <https://webkit.org/b/37322> || [Qt] tst_QWebHistory::serialize_2() fails || || <https://webkit.org/b/35340> || [Qt] Enable alternate HTML/JavaScript front-ends for Web Inspector || || <https://webkit.org/b/39314> || [Qt] Skipping popup focus test for maemo || || <https://webkit.org/b/39150> || Canvas's getContext() must return null when called with an invalid/unsupported parameter || || <https://webkit.org/b/39153> || Canvas's toDataURL() should be case insensitive wrt the mimeType argument || || <https://webkit.org/b/39218> || [Qt] Tiled backing store tiles sometimes flicker when exiting a zoom animation || || <https://webkit.org/b/38456> || [Qt] QtTestBrowser does not support websites which requires HTTP Authentication via dialogs || || <https://webkit.org/b/37273> || [Qt] Weekly binary builds on Mac OS X don't work when launched in the Finder || || <https://webkit.org/b/38779> || [Qt] QWebPage::inputMethodQuery() returns wrong values for Qt::ImCursorPosition, Qt::ImAnchorPosition || || <https://webkit.org/b/38526> || [Qt] REGRESSION: CoolClock isn't rendered properly || Plus def file fixes.
* | | | | Upgrade harfbuzz to the latest versionLars Knoll2010-05-272-13/+25
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the folling changes from harfbuzz: commit 85ad0ddd092522b4cff251f324128662f100991f Author: Lars Knoll <lars.knoll@nokia.com> Date: Thu May 27 16:05:00 2010 +0200 use unsigned char instead of unsigned in the bitfield. This saves significant memory, as the HB_CharAttributes and HB_GlyphAttributes structures are not 4 byte aligned anymore, by aligned to 1 resp. 2 bytes. The change is not compliant with ISO C, but accepted by almost all compilers. commit 30f0e6c3d0aa67ab9ff95c60903fe28c4df80fbc Author: Behdad Esfahbod <behdad@behdad.org> Date: Mon May 17 15:43:46 2010 -0400 [hangul] Fix typo Reviewed-By: Thiago Macieira
* | | | escape backslashesOswald Buddenhagen2010-05-263-5/+5
|/ / / | | | | | | | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* | | Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-191-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale_symbian.cpp
| * \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-181-1/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits) re-add overriding of tool paths to configure fix regexp Support linked fonts (.ltt) from standard font locations. fix path separators in install targets for MinGW+sh fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec define qtPrepareTool() function and use it throughout QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike QNAM HTTP: And one more testcase QNetworkAccessManager: Backends were tried in wrong order Fix QUrl::isValid if the host contains invalid caracter. Fix anomaly demo control strip icon placement QUrl: parsing of host name with an undercore. Fixed race condition compiling xmlpatterns tests. Remove qdbusserver from tests/auto/dbus.pro QNAM HTTP: Preemptive anti crash if() statement QNAM HTTP: More testcases Fixing compiling issues. Remove garbage test. OpenVG blending modes from VG_KHR_advanced_blending extension Fix spurious mouse click when dismissing a native menu ...
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-1/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| | | * Phonon QT7 backend; Don't release string after unsuccessful ↵Justin McPherson2010-05-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | AudioDeviceGetProperty(). Reviewed-by:Andrew den Exter
* | | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-05-194-6/+40
|/ / / | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 ) Changes since last update: Mingw-w64 fixes
* | | Updated WebKit to cacbdf18fc917122834042d77a9164a490aafde4Simon Hausmann2010-05-184-6/+18
| | | | | | | | | | | | Cherry pick http://trac.webkit.org/changeset/59606 to fix auto-test regression of r59563
* | | Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341dSimon Hausmann2010-05-167-8/+61
| | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38444> || [Qt] GraphicsLayer caches directly composited images || || <https://webkit.org/b/37684> || [Qt] JSValue QtClass::fallbackObject can be optimized || || <https://webkit.org/b/37701> || [Qt] Target(WebCore,jsc,...) must depends on static library of JavaScriptCore ||
* | | Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372aSimon Hausmann2010-05-1513-10/+80
|/ / | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/37665> || [Qt] Rename QtLauncher to QtTestBrowser || || <https://webkit.org/b/37381> || [Qt] animations/dynamic-stylesheet-loading.html fails with accelerated compositing || || <https://webkit.org/b/38630> || VS2010 asserts a null iterator passed to std::copy in Vector::operator= || || <https://webkit.org/b/38440> || [Qt] use QT_MOBILE_THEME in Symbian || || <https://webkit.org/b/39031> || CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string. || || <https://webkit.org/b/38949> || JavaScript unable to invoke methods declared in QML ||
* | Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7cSimon Hausmann2010-05-1430-229/+718
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: * Doc day API doc overhaul || <https://webkit.org/b/38370> || [Qt] GraphicsLayer: depth-test causes flicker in certain situations || || <https://webkit.org/b/38921> || [Qt] emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout || || <https://webkit.org/b/38863> || [Qt] Detect debug mode consistently || || <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent || || <https://webkit.org/b/39062> || [Qt] Improve QtLauncher user agent dialog resize || || <https://webkit.org/b/38841> || Ignore invalid values for various CanvasRenderingContext2D properties || || <https://webkit.org/b/38685> || [Qt] tst_QWebPage::inputMethods failing on Maemo5 || || <https://webkit.org/b/38655> || [Qt] REGRESSION(r58497) tst_QGraphicsWebView::crashOnViewlessWebPages() is failing ||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-144-17/+2
|\ \ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc
| * | Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dcSimon Hausmann2010-05-134-17/+2
| | | | | | | | | | | | Disable the JIT on Symbian again, as it causes crashes.
generated by cgit v0.12 at 2025-01-05 00:10:17 (GMT)