summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Updated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316Simon Hausmann2010-07-0114-35/+298
| | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38597> || [Qt] QtTestBrowser does not have a "Load" button ; therefore, unable to load pages on touch only symbian devices (portrait mode). || || <https://webkit.org/b/40846> || [Qt] GraphicsLayerQt delay seems unnecessary. || || <https://webkit.org/b/41160> || Spatial Navigation: make elements in inner frames nested more than 1 level deep focusable || || <https://webkit.org/b/39019> || [Qt] Combobox doesn't close when scrolling in graphicsbased mode || || <https://webkit.org/b/41164> || [Qt] QtWebKit crashes if <select>'s render changes in its onchange event || || <https://webkit.org/b/41198> || [QT][S60] build-webkit scripts picks wrong make spec for windows build || || <https://webkit.org/b/41278> || [Qt] Replace single treat-as-space characters with normal space || || <https://webkit.org/b/37303> || [Qt] Application crash on exit if NPPlugin is loaded || || <https://webkit.org/b/40378> || [Qt] When any geometry change happens to a node it will resize the backing cache || || <https://webkit.org/b/40795> || [Qt] Crash when uploading document to Google Docs || || <https://webkit.org/b/40446> || [Qt] Only 10 websites can be loaded consecutively when using QtWebkit 2.0 ||
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-291-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed deployment paths for WebKit declarative plugin. Fix s60main linking issue with gcce applications Fixed deployment paths for the symbian/linux-armcc mkspec. Fixed a relative path problem in qml demos. Added the APP_PRIVATE_DIR_BASE variable. Various fixes to autotests when using the symbian/linux-armcc mkspec. Fixed Symbian resources not honoring TARGET with a path. Removed useless comments.
| * Fixed deployment paths for WebKit declarative plugin.axis2010-06-291-1/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-295-2/+27
|\ \ | |/ |/| | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-285-2/+27
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7
| | * Updated WebKit to 38d650efc92427cd6452f6685d3c40d22428cdb7Simon Hausmann2010-06-285-2/+27
| | | | | | | | | | | | | | | || <https://webkit.org/b/40000> || [Qt] QGraphicsWebView crash when calling setScale() before setUrl() || || <https://webkit.org/b/38597> || [Qt] QtTestBrowser does not have a "Load" button ; therefore, unable to load pages on touch only symbian devices (portrait mode). ||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-285-5/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Enable SSE2 for MSVC x64 builds, as it was incorrectly disabled Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-28062010 ( 0fccd26d3624e80cf68873701ef70ad72ca66bec ) ignore *.vcxproj.user doc: Added more DITA output to the XML generator Don't load ciphers and system certificates for QSslSocket::supportsSsl() Doc: Fixed whitespace issues and added missing files to lists. Doc: Fixed links in the QML documentation. Doc: Changed links to explicitly refer to QML objects. qdoc: Added a workaround for QML/Qt class name clashes.
| * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-06-285-5/+56
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-28062010 ( 0fccd26d3624e80cf68873701ef70ad72ca66bec ) Changes in this update: - Fix Mac OS SnowLeopard-vs-Leopard deployment issue - Fix compilation with Intel compiler
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-282-4/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (33 commits) Fix build with def files on arm Build fix for src/plugins/phonon/mmf Make symbian/unix shadow builds work again. Change the files to camelcase as avkon now does that Update EABI and WINSCW DEF files for Symbian Fix linking on arm with def files Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595ab62b7c5f703a286c4f5f13f8784a936 Fixed incorrect parsing of TARGET.EPOCHEAPSIZE. Fixed make runonphone that looked for the package in the wrong place. Fixed several problems with the postlinker for Symbian (elf2e32). Don't crash when cleaning the uninitialized fontdatabase (Symbian) Revert "Fixing the race condition in event dispatcher implementation on" Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path" Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Fixed memory restrictions not being passed on to elf2e32. Allow TLW translucency on Symbian without Qt::FramelessWindowHint Updated UIDs for spectrum demo Ensure that compiling with the no debug/warning output defines works Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 ...
| * | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-251-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | 4b88f595ab62b7c5f703a286c4f5f13f8784a936 * Fix crash/regression in thai line word breaking when libthai is installed: Commit 4b88f595ab62b7c5f703a286c4f5f13f8784a936 upstream ensures the zero termination of the string passed to libthai.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-241-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (26 commits) Fixed incorrect parsing of TARGET.EPOCHEAPSIZE. Fixed make runonphone that looked for the package in the wrong place. Fixed several problems with the postlinker for Symbian (elf2e32). Don't crash when cleaning the uninitialized fontdatabase (Symbian) Revert "Fixing the race condition in event dispatcher implementation on" Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path" Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Fixed memory restrictions not being passed on to elf2e32. Allow TLW translucency on Symbian without Qt::FramelessWindowHint Updated UIDs for spectrum demo Ensure that compiling with the no debug/warning output defines works Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 Clean up HB_Anchor's DeviceTables on failure when loading format 3 Make sure ValueRecord's DeviceTables are cleaned up on failure Phonon(qt7); Don't try and display video frames when audio only. Audio(osx); Fix period size calculation. Audio(osx); refactor input period conversion Audio(osx); Fix audio format converters. Fix null HB_Device** dereference on exit in Harfbuzz GPOS code ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-06-248-5/+46
| | |\
| | * | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a80fd59e3b3b18116803a14e6369345933994236 * Disable data structure packing with RVCT, as it appears that the compiler miscompiles the code.
| | * | Provide the Webkit Qml plugin with a UID3 on SymbianAlessandro Portale2010-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | ...otherwise we cannot Symbian sign it. Reviewed-by: Miikka Heikkinen
* | | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-06-282-8/+4
|/ / / | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-28062010 ( f483443ccd7d21f2a57a794c4d00a63505d2f5d9 ) Revert our workaround for Mac OS VM tags issue, since it was fixed properly in r57583 (cherry-picked in 528ffd602cc5a501713cd768df0cf6870a36ddad)
* | | Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06Simon Hausmann2010-06-2415-128/+274
| | | | | | | | | | | | | | | | | | | | | | | | * Fixed QML packaging || <https://webkit.org/b/39304> || Add an inlineCapacity template parameter to ListHashSet and use it to shrink the positioned object list hash set. || || <https://webkit.org/b/39309> || Allocate the m_preloads list hash set dynamically and free it when done. || || <https://webkit.org/b/33150> || Do not render the full frame when there is some elements with fixed positioning ||
* | | Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-242-7/+7
| |/ |/| | | | | | | Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* | Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
|/ | | | | | * Build fixes for package builds * Fix build with QT_NO_COMBOBOX * Upstream David's doc fix
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2281-6308/+3063
|\
| * Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cdSimon Hausmann2010-06-2133-322/+996
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 ||
| * Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066dSimon Hausmann2010-06-217-39/+98
| | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/40714> || [Qt] Compilation in QWebPagePrivate::timerEvent with clang || || <https://webkit.org/b/40717> || [Qt] Bridge documentation: some snippets have the wrong indentation || || <https://webkit.org/b/40662> || [Qt] Avoid truncation of zoom factor in QWebFrame's print function. ||
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2151-5962/+1984
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | * Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-2029-5961/+0
| | | | | | | | | | | | * Don't include QtScript Phoenix here until it's ready for release :)
| | * Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-194-3/+17
| | | | | | | | | | | | || <https://webkit.org/b/40483> || [Qt] The new Qt's documentation text layout is messed up with QtWebKit. ||
| | * Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aefSimon Hausmann2010-06-184-5/+13
| | | | | | | | | | | | Doc fixes from Alexis :)
| | * Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749aSimon Hausmann2010-06-1813-16/+265
| | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/40107> || Impossible to set input method hints based HTML5 input types || || <https://webkit.org/b/40102> || WebCore EventHandler needs to take account of onLoad events fired before layout() complete || || <https://webkit.org/b/40830> || REGRESSION(r60958) [Qt] qwebpage::inputMethods auto-test fails ||
| | * Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5Simon Hausmann2010-06-185-4/+20
| | | | | | | | | | | | | | | | | | Doc and build fixes: http://trac.webkit.org/changeset/61400
| | * Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5Simon Hausmann2010-06-188-10/+38
| | | | | | | | | | | | * Build fixes from the trunk
| | * Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26baSimon Hausmann2010-06-1811-4/+1672
| | | | | | | | | | | | | | | | | | Integrated: || <https://webkit.org/b/40050> || [Qt] Upstream the WebKit QML integration plugin ||
* | | Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-221-4/+3
| | | | | | | | | | | | | | | | | | | | | f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 * Import f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 which fixes a crash with certain fonts.
* | | Clean up HB_Anchor's DeviceTables on failure when loading format 3Andreas Kling2010-06-221-1/+2
| | |
* | | Make sure ValueRecord's DeviceTables is cleaned up on failureAndreas Kling2010-06-221-2/+3
| | | | | | | | | | | | | | | Cleanup was a missing for the case where loading an X placement device table failed.
* | | Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanupAndreas Kling2010-06-211-1/+1
| | |
* | | Fix null HB_Device** dereference on exit in Harfbuzz GPOS codeAndreas Kling2010-06-213-16/+20
| | | | | | | | | | | | Caught by QFontDialog autotest.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-218-103/+94
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Allow GNU Free Documentation license header. Add missing license header. Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072 Fix example compile and runtime warnings, webkit examples not built. qgl_cl_p.h is no longer existent Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2 Doc: Fixed documentation errors. doc: Added more DITA output to the XML generator doc: Fixed type of Package::name Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a252b524d34f3ed970eef3bdb6350a2b77 Fix for emitting changed signal in QClipboard Fixed tst_QNetworkDiskCache creating badly named directories. Specialize peek() for QBuffer Documentation changes to QTextLayout. Doc: Updated example license to three clause BSD license.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-218-103/+94
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072 Fix example compile and runtime warnings, webkit examples not built. qgl_cl_p.h is no longer existent Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2 Doc: Fixed documentation errors. doc: Added more DITA output to the XML generator doc: Fixed type of Package::name Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a252b524d34f3ed970eef3bdb6350a2b77 Fix for emitting changed signal in QClipboard Fixed tst_QNetworkDiskCache creating badly named directories. Specialize peek() for QBuffer Documentation changes to QTextLayout. Doc: Updated example license to three clause BSD license.
| | * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-203-33/+8
| | | | | | | | | | | | | | | | | | | | | ab9a897b688e991a8405cf938dea9d6a2f1ac072 From Andreas Kling <andreas.kling@nokia.com>: * Unbreak _HB_OPEN_Get_Device() and Get_ValueRecord()
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-1826-300/+618
| | |\
| | | * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-182-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2 Author: Andreas Kling <andreas.kling@nokia.com> Date: Fri Jun 18 16:10:31 2010 +0200 Make HB_AnchorFormat3's Device tables a pointer array Saves sizeof(pointer) * 1 when the font doesn't have these tables. Cuts resident memory consumption by 40kB when loading qt.nokia.com in QtWebKit. Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
| | | * Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ↵Simon Hausmann2010-06-185-70/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 508b02a252b524d34f3ed970eef3bdb6350a2b77 * Andreas' compression for HB_ValueRecord * Re-enable packing for RVCT
| | * | Doc: Fixed documentation errors.David Boddie2010-06-181-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-211-7/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Start the implementation of in-place recoding for images Fix a possible crash with the EVR video renderer in windows Don't do opaque detection when copying a sub-rect of a QPixmap. Optimized QPixmap::fromImage for raster pixmaps. Doc: Small change to QAbstractItemDelegate::editorEvent() Typo in qcleanlooksstyle.cpp Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types. Speed up calls to QPainter::setCompositionMode when the mode is unchanged
| * | | 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/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-1716-99/+541
|\ \ \ | |/ / |/| | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 6623b5da196390748dc619461739f9cb84524736
| * | Updated WebKit to 6623b5da196390748dc619461739f9cb84524736Simon Hausmann2010-06-1716-99/+541
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38401> || Make repaint throttling parameters configurable runtime. || || <https://webkit.org/b/40073> || [Qt] rendering error in mediawiki || || <https://webkit.org/b/36463> || Spatial Navigation: make it work with focusable elements in overflow content || || <https://webkit.org/b/39857> || GIFs loop one time too few || || <https://webkit.org/b/36818> || [Qt] Animated GIF images does not animate 10x as expected by default. || || <https://webkit.org/b/37844> || [Qt] Image::drawTiled animations does not work || || <https://webkit.org/b/40567> || [Qt] QtWebKit crashes while initializing flash plugin 10.1.53.64... || || <https://webkit.org/b/39439> || Spatial Navigation: using offset{Left,Top} is not enough to get the proper inner frames position || || <https://webkit.org/b/39195> || Spatial Navigation: refactor scrollInDirection to work with scrollable content ||
* | | 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.
generated by cgit v0.12 at 2024-10-27 05:28:55 (GMT)