summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-240-0/+0
|\
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-230-0/+0
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-2213-24/+529
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Doc: Documented that border width does not affect rectangle geometry. Doc: Minor fixes to style. Doc: Updated the DirectFB documentation to reflect version changes. Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt Quick Doc: Correcting references to Qt Declarative module. doc: Stated that the destructor does not call close().
* | | | Doc: Added documentation about Tab and Backtab key handling.David Boddie2010-11-241-1/+23
|/ / / | | | | | | | | | Task-number: QTBUG-15569
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-23155-5216/+7595
|\ \ \
| * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-22109-5160/+7250
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-11-220-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed handling of QInputMethodEvents with nonzero replacementLength.
| | | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-11-220-0/+0
| | | |\ | | |/ / | | | | | | | | No changes.
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-222-2/+22
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed handling of QInputMethodEvents with nonzero replacementLength.
| | | | * Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These types of events replace text that is already in the widget, but WebKit did not check for replacementLength at all. RevBy: Janne Koskinen Task: QT-4303 Task: https://bugs.webkit.org/show_bug.cgi?id=49787 AutoTest: Included
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-226-28/+49
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile when USER_TIMER_MINIMUM isn't defined Docs: QTBUG-10866 Description of how AutoConnection is resolved. Fix compilation with Sun Studio 12.1. Compile with QT_NO_PROXYSCREEN. silence compiler warnings Don't let posted events starve native dialogs (regression)
| | | * | Compile when USER_TIMER_MINIMUM isn't definedBradley T. Hughes2010-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just user a value of zero instead. Windows will use USER_TIMER_MINIMUM anyways (according to the SetTimer() docs). Reviewed-by: trustme
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-11-2265-641/+928
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-195-23/+45
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation with Sun Studio 12.1. Compile with QT_NO_PROXYSCREEN. silence compiler warnings Don't let posted events starve native dialogs (regression)
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-195-23/+45
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation with Sun Studio 12.1. Compile with QT_NO_PROXYSCREEN. silence compiler warnings Don't let posted events starve native dialogs (regression)
| | | | | | * | Fix compilation with Sun Studio 12.1.Thiago Macieira2010-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: "tst_qdbusconnection.cpp", line 301: Error: Could not find a match for QTest::qCompare<QTest::T>(QObject*, MyObject*, const char[29], const char[5], const char[24], int) needed in tst_QDBusConnection::registerObject(). "tst_qdbusconnection.cpp", line 498: Error: Could not find a match for QTest::qCompare<QTest::T>(QObject*, TestObject*, const char[39], const char[12], const char[24], int) needed in tst_QDBusConnection::callSelf(). Task-number: QTBUG-15324 Patch-by: Pavel Heimlich Reviewed-by: Thiago Macieira
| | | | | | * | Compile with QT_NO_PROXYSCREEN.Sam Magnuson2010-11-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 931 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | | | * | silence compiler warningsHarald Fernengel2010-11-192-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence shadowing warnings from gcc.
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-181-14/+34
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Don't let posted events starve native dialogs (regression)
| | | | | | | * | Don't let posted events starve native dialogs (regression)Bradley T. Hughes2010-11-181-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit eb1015c7bbf135af3656110a4d112377c1209db8, it is possible for posted events to starve some of the (most likely internal) messages used by native dialogs. This commit reverts eb1015c7bbf135af3656110a4d112377c1209db8, and instead introduces a Windows timer to keep sendPostedEvents() happening while the event queue is very active. The GetMessage() hook we install will eventually see when the queue is empty and we can use PostMessage() again, which will then stop this timer. This fixes the regression reported in QTBUG-14655, as well as all of the other reported regressions and problems since the initial commit 31f1ff91028dd7f90925d5b3737e4d88b5fb07aa (which ensures that posted events are sent even when Windows is spinning the message loop). Task-number: QTBUG-14655 Reviewed-by: joao
| | | * | | | | | Docs: QTBUG-10866 Description of how AutoConnection is resolved.Peter Yard2010-11-221-5/+4
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-22103-5132/+7201
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update qml visual tests on mac. Doc
| | | * | | | | Update qml visual tests on mac.Yann Bodson2010-11-22102-5131/+7199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14792
| | | * | | | | DocAaron Kennedy2010-11-221-1/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15456
| * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-1946-56/+345
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-1935-43/+300
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo. Fix possible missing glyphs in raster engine glyph cache Fix possible corrupted text when gl glyph cache becomes full Check correctly before including SSE4.2 header. Fixed crash when destroying QGLWidget Prevent crash in GL 2 engine when stroking null rectangle. Compile fix. Documentation update for new switching events. Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system. Doc: Fixing typo Fix possible missing glyphs in text when using GL engine
| | | * | | | Doc: Fixing typo.Sergio Ahumada2010-11-191-1/+1
| | | | | | |
| | | * | | | Fix possible missing glyphs in raster engine glyph cacheEskil Abrahamsen Blomfeldt2010-11-192-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two possible failures when using the glyph cache on raster engine and populating the cache with very many glyphs: 1. Change 72f161739b270b01807f97cd853030440f0fd430 caused the maximum height of the glyph cache to be 32768, which was not sufficient for large fonts with very many characters (e.g. Chinese text) 2. Since we are using QPainter to draw into the glyph cache for RGB32 glyphcaches, and QPainter does not support very high coordinates, we need to create a reference image that references a section of the glyph cache and paint into that instead. Task-number: QT-3971 Reviewed-by: Samuel
| | | * | | | Fix possible corrupted text when gl glyph cache becomes fullEskil Abrahamsen Blomfeldt2010-11-195-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the OpenGL glyph cache filled up (the max texture size on the hardware was exceeded) the characters would be drawn as black blocks instead. As a work-around for this, the cache will now be cleared and repopulated whenever this happens, meaning that once in a while (when a lot of different glyphs have been drawn in a font) there will be a performance hit. A more complete solution is described in QTBUG-13784, but this requires so much refactoring that it was deemed too risky for a patch release. This patch fixes the problem with a small penalty and low risk. Task-number: QT-3971 Reviewed-by: Samuel
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-1832-30/+253
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Check correctly before including SSE4.2 header. Fixed crash when destroying QGLWidget Prevent crash in GL 2 engine when stroking null rectangle. Compile fix. Documentation update for new switching events. Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system. Doc: Fixing typo Fix possible missing glyphs in text when using GL engine
| | | | * | | Check correctly before including SSE4.2 header.Mike McQuaid2010-11-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this failed machines that only had SSE4.1 but not SSE4.2 due to an assumption that nmmintrin.h could be included when only using SSE4.1. Fixes http://bugreports.qt.nokia.com/browse/QTBUG-13623. Merge-request: 929 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-1831-28/+247
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed crash when destroying QGLWidget Prevent crash in GL 2 engine when stroking null rectangle. Compile fix. Documentation update for new switching events. Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system. Doc: Fixing typo Fix possible missing glyphs in text when using GL engine
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-1731-28/+247
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed crash when destroying QGLWidget Prevent crash in GL 2 engine when stroking null rectangle. Compile fix. Documentation update for new switching events. Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system. Doc: Fixing typo Fix possible missing glyphs in text when using GL engine
| | | | | | * | | Fixed crash when destroying QGLWidgetThorbjørn Lindeijer2010-11-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGLWidget destroys the QGLContext, which in turn destroys the bound pixmap. When this happens there may not be a current QGLContext, so check that before trying to restore it. Done-with: Gunnar Sletta Reviewed-by: Samuel
| | | | | | * | | Prevent crash in GL 2 engine when stroking null rectangle.Samuel Rødal2010-11-172-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15320 Reviewed-by: Kim
| | | | | | * | | Compile fix.Samuel Rødal2010-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why this worked before. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | | | * | | Documentation update for new switching events.Michael Dominic K2010-11-172-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 926 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | | | | * | | Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.Michael Dominic K2010-11-174-2/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 926 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-1723-24/+46
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fix possible missing glyphs in text when using GL engine
| | | | | | | * | | Doc: Fixing typoSergio Ahumada2010-11-1620-22/+22
| | | | | | | | | |
| | | | | | | * | | Fix possible missing glyphs in text when using GL engineEskil Abrahamsen Blomfeldt2010-11-163-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you create/destroy gl contexts a lot, you may sometimes get a new context with the same pointer as a destroyed context. When you look up the glyph cache in the font engine using the context pointer as a key, you will then get a glyph cache which contains no valid data. We need to reset the glyph cache completely in this case and set up bindings for the new context so that the glyph cache can be repopulated and reused. Note that there is a different solution for this in Qt 4.8, so this is temporary solution for the Qt 4.7.x series. Task-number: QT-4162 Reviewed-by: Fabien Freling
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-1911-13/+45
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move qmlvisualaids to another repo Initial commit of qmlvisualaids Allow testing of raster engine on Mac from qmlviewer Don't leak QML compiled data objects Add missing symbols to QtOpenGL arm def file Add missing symbols to QtOpenGL emulator def file Doc: clarify Flickable children vs. contentItem children. Add a test on QWS Fix parent bug for QDeclarativeOpenMetaObject Add missing symbols in QtGui emulator def file
| | | * | | | | | | Move qmlvisualaids to another repoAlan Alpert2010-11-199-391/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved to a personal repo, since its fate is a little uncertain so it shouldn't draw this much attention. Task-number: QTBUG-14792
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-197-10/+32
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Allow testing of raster engine on Mac from qmlviewerAaron Kennedy2010-11-191-0/+9
| | | | | | | | | | |
| | | | * | | | | | | Don't leak QML compiled data objectsAaron Kennedy2010-11-193-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14761
| | | | * | | | | | | Add missing symbols to QtOpenGL arm def fileJoona Petrell2010-11-191-0/+5
| | | | | | | | | | |
| | | | * | | | | | | Add missing symbols to QtOpenGL emulator def fileJoona Petrell2010-11-191-3/+8
| | | | | | | | | | |
| | | | * | | | | | | Doc: clarify Flickable children vs. contentItem children.Martin Jones2010-11-191-0/+7
| | | | | | | | | | |
| | | * | | | | | | | Initial commit of qmlvisualaidsAlan Alpert2010-11-199-0/+391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A tool to make it easier to do the platform visual updating. Needs to be streamlined at least a little in order to make it feasible to stay up to date. Task-number: QTBUG-14792
generated by cgit v0.12 at 2025-02-04 21:10:12 (GMT)