summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2299-7343/+2341
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2299-7343/+2341
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix WebKit declarative examples (second try) Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d 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
| | * Fix WebKit declarative examples (second try)Simon Hausmann2010-06-221-1/+1
| | | | | | | | | | | | | | | | | | Forgot one occurrence of org.webkit :) Reviewed-by: Trust me
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2298-7342/+2340
| | |\ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d 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
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2298-7342/+2340
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d 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
| | | * Fix examplesSimon Hausmann2010-06-216-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Import QtWebKit instead of org.webkit Reviewed-by: Trust me
| | | * 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-2162-6990/+1255
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 :)
| | | | * Update S60 stuff after renaming the webkit component.Alexis Menard2010-06-182-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new name is QtWebKit not org.webkit. Reviewed-by:jbarron
| | | | * Update qmlchanges from import org.webkit to QtWebKitAlexis Menard2010-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| | | | * 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
| | | | * Remove the old WebView element in src/import. The new one is in ↵Alexis Menard2010-06-1810-1764/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/3rdparty/webkit Also change a bit the demo due to a little API change. The module is not org.webkit but QtWebKit now. Reviewed-by:simon hausmann
| | | | * 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 ||
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-222-4/+7
|\ \ \ \ \
| * | | | | Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since they are used internally for some legacy stuff. We prohibit "groupButtonId" and "database". Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-11584
| * | | | | 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.
* | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-223-8/+71
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Some of the cxxVariable stuff for properties. Task-number: QTBUG-11391
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cxxTypedef stuff for typedefs. Task-number: QTBUG-11391
* | | | | Finish merge conflict.Martin Smith2010-06-22733-15155/+8433
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 Conflicts: tools/qdoc3/ditaxmlgenerator.cpp
| * | | | | qdoc3: Build fix for regression in f321a3f2b1eAndreas Kling2010-06-222-4/+4
| | | | | |
| * | | | | Clean up HB_Anchor's DeviceTables on failure when loading format 3Andreas Kling2010-06-221-1/+2
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-221456-37965/+30385
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Make sure ValueRecord's DeviceTables is cleaned up on failure qdoc3: Build fix for regression in e2f0e728e Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup Fix null HB_Device** dereference on exit in Harfbuzz GPOS code Doc: Relicensed the documentation under the GNU FDL version 1.3. doc: Added more DITA output to the XML generator Designer: Prevent QButtonGroup from being added for Q3ButtonGroup. Fix for a leak in the mac style. Doc: Fixing bugs to style and script doc: Added more DITA output to the XML generator Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText() Fix compiler warnings in QtGui (text,painting). Allow Unix to generate unique UUIDs if /dev/urandom exists. 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. ...
| | * | | | 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.
| | * | | | qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-223-6/+5
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-211457-37966/+30386
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup Fix null HB_Device** dereference on exit in Harfbuzz GPOS code Doc: Relicensed the documentation under the GNU FDL version 1.3. doc: Added more DITA output to the XML generator Designer: Prevent QButtonGroup from being added for Q3ButtonGroup. Fix for a leak in the mac style. Doc: Fixing bugs to style and script doc: Added more DITA output to the XML generator Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText() Fix compiler warnings in QtGui (text,painting). Allow Unix to generate unique UUIDs if /dev/urandom exists. 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 ...
| | | * | | 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 4.7David Boddie2010-06-2164-341/+1420
| | | |\ \ \
| | | * | | | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-21578-14522/+7428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-225-10/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compiler warnings (unused variables). Compiler warnings. Fix crash with large ClientCutMessage Fix crash at exit and out of bounds write fix issue wrt posted events on Windows CE
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-215-10/+11
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compiler warnings (unused variables). Compiler warnings. Fix crash with large ClientCutMessage Fix crash at exit and out of bounds write fix issue wrt posted events on Windows CE
| | | * | | | | Compiler warnings (unused variables).Bjørn Erik Nilsen2010-06-211-3/+0
| | | | | | | |
| | | * | | | | Compiler warnings.Bjørn Erik Nilsen2010-06-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: jbarron
| | | * | | | | Fix crash with large ClientCutMessagePaul Olav Tvete2010-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to read the text length more than once. Task-number: QTBUG-9977 Reviewed-by: Jørgen
| | | * | | | | Fix crash at exit and out of bounds writePaul Olav Tvete2010-06-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11542, QTBUG-11196 Reviewed-by: Jørgen
| | | * | | | | fix issue wrt posted events on Windows CEJoerg Bornemann2010-06-211-1/+5
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetQueueStatus(QS_TIMER) is unreliable if the application has a menu on Windows CE. This patch uses PeekMessage(WM_TIMER) instead. Task-number: QTBUG-10714 Reviewed-by: bhughes
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2296-426/+528
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add screenshots for most examples and demos Rename example: edit -> textselection Clean up some examples Rename example and add minor improvements Rename example image file Spelling fix
| | * | | | | Add screenshots for most examples and demosBea Lam2010-06-2250-33/+283
| | | | | | |
| | * | | | | Rename example: edit -> textselectionBea Lam2010-06-226-0/+16
| | | | | | |
| | * | | | | Clean up some examplesBea Lam2010-06-2237-374/+195
| | | | | | |
| | * | | | | Rename example and add minor improvementsBea Lam2010-06-221-17/+32
| | | | | | |
| | * | | | | Rename example image fileBea Lam2010-06-222-1/+1
| | | | | | |
| | * | | | | Spelling fixBea Lam2010-06-221-1/+1
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-2117-18/+79
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update 4.7-beta2 def files Added Samsung and Sony-Ericsson manufacturer IDs to sqlite3.sis Fix for TLS problem which causes apps to crash in the S60 port Fixed bearer plugin deployment in libinfixed builds Always add QtNetwork include path when linking with QtWebkit in Symbian Assigning 0xA UID3s to the new standalone qml demos
generated by cgit v0.12 at 2025-09-21 12:31:04 (GMT)