summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QStroker: Fix erroneous SvgMiterJoin behavior for parallel linesAndreas Kling2010-09-121-1/+1
| | | | | | | | | QLineF::intersect() yields an undefined intersectionPoint for parallel lines. Thus if the distance to 0,0 is shorter than the current miter limit, we would draw a triangle to 0,0. Handle this by not drawing the triangle for parallel lines. This matches the behavior of Qt::MiterJoin.
* Revert "Properly implement qobject_cast for const pointers."Thiago Macieira2010-09-113-21/+6
| | | | | | | This commit added new symbols to the 4.7 branch after 4.7.0 was frozen. This reverts commit 0b0aa7603b27447a5abe55c55d0514bc56b35f9e.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1118-165/+244
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter NTLM code: Save domain in different variable Update the error handling of invalid hostnames in QUrl. Remove unsupported code from qobject.h for MSVC < .NET 2003 Properly implement qobject_cast for const pointers. Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1018-165/+244
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter NTLM code: Save domain in different variable Update the error handling of invalid hostnames in QUrl. Remove unsupported code from qobject.h for MSVC < .NET 2003 Properly implement qobject_cast for const pointers. Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
| | * Bearer management: Fix compilation with namespace.Christian Kandeler2010-09-101-0/+2
| | |
| | * Implement a private API for setting title widgetsHarald Fernengel2010-09-109-50/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | Meego and Orbit use client side decorations, so implement a top-level layout in QMainWindow that allows us to set title widgets. To prevent regressions on other platforms, the API is disabled by default. Rev-By: Robert Griebl Rev-By: Thierry Bastian
| | * Fix the bug for QSettings on Windows, to store qint32/quint32, ↵Liang Qi2010-09-101-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | qint64/quint64 in Windows registry. Reviewed-by: Prasanth Ullattil Reviewed-by: Joerg Bornemann Task: QTBUT-13249 AutoTest: Included
| | * Added private API to install an x11EventFilterHarald Fernengel2010-09-101-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Some libs need to intercept X11 events without actually being able to subclass QApplication, so add a private API to allow setting event filter functions. Reviewed By: Robert Griebl
| | * NTLM code: Save domain in different variableMarkus Goetz2010-09-102-9/+31
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * Update the error handling of invalid hostnames in QUrl.Thiago Macieira2010-09-101-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should let QUrl::errorString() show the original, invalid hostname in the URL it reports to be invalid. There may be a side-effect that QUrl::toEncoded() may include the broken hostname on the first call, then miss it in the next calls. But since QUrl::isValid() is returning false, we can consider that the result of toEncoded() is undefined, so anything goes. Reviewed-by: Olivier Goffart
| | * Remove unsupported code from qobject.h for MSVC < .NET 2003Thiago Macieira2010-09-101-91/+0
| | | | | | | | | | | | Reviewed-By: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * Properly implement qobject_cast for const pointers.Thiago Macieira2010-09-103-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | Instead of using ugly const_cast in public headers and Q_UNUSED (which expands to nothing in release builds), use a properly-const method. Reviewed-By: Bradley T. Hughes
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-103-5/+16
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix crash in QRuntimeGraphicsSystem due to destruction order. Fix crash in OpenVG when failing to allocate large VGImages. Updated 4.7.0 changelog
| * | Fix crash in QRuntimeGraphicsSystem due to destruction order.Jason Barron2010-09-102-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, fix a "leak" by deleting the graphics system when QApplication is destroyed. Secondly, fix a crash when the following scenario occurs: - ~QApplication() deletes the current graphics system (see above) - ~QApplication() calls qt_cleanup() - qt_cleanup() calls QPixmapCache::clear() to delete pixmaps - ~QRuntimePixmapData() tries to remove the pixmap from the runtime graphics system, but it has already been deleted. - *Crash* Reviewed-by: Gunnar Sletta Reviewed-by: Jani Hautakangas
| * | Fix crash in OpenVG when failing to allocate large VGImages.Jason Barron2010-09-101-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reclaimSpace() function of the VG image pool was crashing when attempting to free up space for a large image. It was calling moveToHeadOfLRU() which adds the image to the pool. If the pixmap is large enough so that it pushes all the others out, then it will be the only pixmap left in the pool when this function returns. This is problematic because this pixmap is not permanent so it could be deleted. If that happens, then subsequent calls to this function will crash because the LRU pixmap has been deleted. The fix is to check if the pixmap was in the pool to begin with and if not, then be sure to remove it before returning from this function. Task-number: QT-3652 Reviewed-by: Jani Hautakangas
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1020-8/+1017
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevented crash in GL window surface when deleting native child widgets. Fix a regression where setPreferredSize(QSize(100, -1)) did not work. Force MeeGo touch to use native graphics system for now. Fixed compiler warnings in meego graphics system helper. Added meego graphics system helper to features/qt.prf and syncqt. Use QFactoryLoader to ensure we get the correct graphics system plugin. Updated license headers for meego graphics system helper. Fixed compilation and API of meego graphics system helper. Renamed meego graphics system helper files. Imported meego graphics system helper sources. Updated license headers for meego graphics system. Fixed compilation and API of meego graphics system. Renamed meego graphics system files. Imported meego graphics system sources. Fix cache_cost initialization of QFontEngineMultiWin Fix crash when using unprintable chars in QStaticText Don't waste memory on the share widget in the GL window surface.
| * | Prevented crash in GL window surface when deleting native child widgets.Samuel Rødal2010-09-101-4/+8
| | | | | | | | | | | | | | | | | | We should only destroy the FBO if it's the actual window that's deleted. Reviewed-by: Trond
| * | Fix a regression where setPreferredSize(QSize(100, -1)) did not work.Jan-Arve Sæther2010-09-101-1/+1
| | | | | | | | | | | | | | | | | | Regressed by change 515991426832a6333f2fd9e639bd4c83e2b27cef Reviewed-by: Frederik Gladhorn
| * | Force MeeGo touch to use native graphics system for now.Samuel Rødal2010-09-101-0/+24
| | | | | | | | | | | | | | | | | | | | | MeeGo touch doesn't yet work with other graphics systems since it assumes that QPixmaps are XPixmap based. If MeeGo touch doesn't link against the graphics system helper we'll force it to use the native graphics system.
| * | Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-103-8/+20
| | | | | | | | | | | | Also, this prevents hard-coding the path to the meego plugin.
| * | Updated license headers for meego graphics system.Samuel Rødal2010-09-108-56/+272
| | |
| * | Fixed compilation and API of meego graphics system.Samuel Rødal2010-09-1013-148/+158
| | |
| * | Renamed meego graphics system files.Samuel Rødal2010-09-109-0/+0
| | |
| * | Imported meego graphics system sources.Samuel Rødal2010-09-109-0/+738
| | | | | | | | | | | | From http://www.gitorious.com/meego-graphics/meego-graphics
| * | Fix cache_cost initialization of QFontEngineMultiWinJiang Jiang2010-09-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, QFontEngineMultiWin does not set its cache_cost according to the regular font engines it refers to, which makes cache management in QFontCache useless because cache_cost is always 0, and garbage collecting timerEvent can hardly be triggered. This patch solve part of the problem by using cache_cost of the first font engine for QFontEngineMultiWin. However, if a font engine is loaded by QFontEngineMulti::loadEngine, the cost is still not counted. Task-number: QTBUG-12562 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-09-103-13/+18
| |\ \
| | * | Don't waste memory on the share widget in the GL window surface.Samuel Rødal2010-09-101-1/+4
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | Fix crash when using unprintable chars in QStaticTextEskil Abrahamsen Blomfeldt2010-09-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assumption that the output glyph array and input glyph array is of equal size is wrong when unprintable characters are used (and discarded in getGlyphPositions()) Task-number: QTBUG-12614 Reviewed-by: Jiang Jiang
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-101-4/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed crash in input methods when using symbols menu and numbers only Fixed crash in input methods when using symbols menu and numbers only
| * | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-101-4/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When inputting only numbers, the symbol menu should not do anything. However in the old code the resource id of the symbol table was still being set, so the symbol key on N97 would look up a table that was not valid for the current input mode and crash. Fixed by setting the symbol table id to zero under those conditions. RevBy: Sami Merila Task: QTBUG-13472 AutoTest: Included
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-101-0/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Read the data when the stream passed in is of type CArchiveStream
| * | Read the data when the stream passed in is of type CArchiveStreamAndy Shaw2010-09-101-0/+13
| |/ | | | | | | | | | | | | | | | | When the stream is of type CArchiveStream then Stat() is not implemented and therefore it will not try to read the data. Therefore if this is not implemented then we try to read the data in chunks instead until there is no more to read or it fails. Reviewed-by: Volker Hilsheimer
* | Autotest for QTBUG-13454.Yann Bodson2010-09-101-2/+1
| |
* | Changing the Image 'source' should not go through the 'Loading' state if the ↵Yann Bodson2010-09-101-10/+13
|/ | | | | | | image is cached. Task-number: QTBUG-13454 Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-095-7/+49
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make sure we blit to the correct FBO in the GL window surface. Some optimizations to the GL pixmap data.
| * Make sure we blit to the correct FBO in the GL window surface.Samuel Rødal2010-09-091-1/+5
| | | | | | | | Reviewed-by: Trond
| * Some optimizations to the GL pixmap data.Samuel Rødal2010-09-094-6/+44
| | | | | | | | | | | | | | - Don't use toImage() / fromImage() to copy when a render FBO is active. - Use raster for rendering to small (< 32x32) pixmaps. Reviewed-by: Trond
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-095-138/+145
|\ \ | |/ |/| | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-095-138/+145
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-091-2/+6
| | |\
| | | * Change RLibrary handle in QS60PluginResolver to be process wideMiikka Heikkinen2010-09-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix enables Symbian version plugins to be accessed from all threads of the process. Task-number: QT-3895 Reviewed-by: Janne Koskinen
| | * | Editable QComboBox popup immediately closes itself after a clickSami Merila2010-09-091-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due that timer that blocks for while mouse release events (blockMouseReleaseTimer) is not started. There is an optimization in QComboBox that tries to avoid calling d->viewContainer() since that method creates the viewContainter if it doesn't exist. Unfortunately this optimization does not take into account if the container is already created. In this particular case, viewContainer is already created, but since QComboBox creates a QLineEdit, it skips the timer start, which leads to situation where combobox's popup menu receiving mouse release event and thus closes itself. As a fix, blockMouseReleaseTimer is started if the viewContainer is already created. Task-number: QTBUG-13231 Reviewed-by: axis
| | * Cursor is misplaced in the editors text areaSami Merila2010-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QInputMethodEvent::Cursor with value 0 is sent to QLineEdit, cursor is still visible. QLineControl (text control widget inside QLineEdit) handles the internal state of cursor visibility correctly and then promptly ignores the state when drawing the text. Issue is corrected by checking the cursor visibility state when drawing the cursor into widget. Task-number: QT-3670 Reviewed-by: axis
| | * QSslSocketPrivate::systemCaCertificates() hangs sometimes on SymbianJuha Turunen2010-09-092-134/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch fixes the hanging issues on some Symbian devices that occurs while retrieving certificates from the Symbian certificate store. The hanging was caused by the certificate info array not being closed before exiting the thread. This alone wouldn't make the existing implementation work, so the patch replaces it with a pure Symbian style implementation which doesn't seem to be affected (probably some OpenC threads issue). Merge-request: 808 Reviewed-by: Shane Kearns Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Task: QTBUG-13033
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-095-11/+57
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QList::toVector()/QVector::toStdVector()/QVector::fromStdVector(): use reserve() When a move is completed, report the source and destination correctly. Fixed the scrolling of text in QLineEdit with right alignment Removing Q_ENUMS declaration in QTransform
| * | QList::toVector()/QVector::toStdVector()/QVector::fromStdVector(): use reserve()Marc Mutz2010-09-091-2/+2
| | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Merge-request: 799
| * | When a move is completed, report the source and destination correctly.Stephen Kelly2010-09-092-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | In rare cases source or destination is changed during the move, so it must be corrected afterward before being reported in the signal. Merge-request: 800 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | Fixed the scrolling of text in QLineEdit with right alignmentThierry Bastian2010-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The scrolling internal member was not changed in cas the text was bigger than the lineedit. Task-number: QTBUG-13520 Reviewed-by: gabi
| * | Removing Q_ENUMS declaration in QTransformJørgen Lind2010-09-091-1/+0
| | | | | | | | | | | | | | | | | | since QTransform does not inherit QObject its redundant Reviewed-by: gunnar
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-0916-3895/+3840
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update running animations if a SmoothedAnimation is changed Fix SmoothedAnimation test and docs Fix qdeclarativeimageprovider autotest compilation on Symbian Fix reversingModes of QDeclarativeSmoothedAnimation Re-add quit button to declarative Twitter demo Recreate Qt 4.7.0 def files over Qt 4.6.3
generated by cgit v0.12 at 2024-12-02 01:03:58 (GMT)