summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1129-183/+408
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1029-183/+408
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| | * fetch next token after class definition openingOswald Buddenhagen2010-09-101-0/+2
| | | | | | | | | | | | | | | | | | this makes no real difference, as at this point the token is known to be an opening brace which will be handled without side effects in the next iteration, but this is a tad more efficient and simply cleaner.
| | * delay next token fetching when opening namespaceOswald Buddenhagen2010-09-103-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | otherwise, if the next token to be fetched is a non-empty #define, it would save the context before entering the namespace, and thus the post-define context restore would just discard the namespace entry. Task-number: QTBUG-12683
| | * don't let operator overloads confuse usOswald Buddenhagen2010-09-103-0/+39
| | | | | | | | | | | | Task-number: QTBUG-11426
| | * don't try to show source when no locations are givenOswald Buddenhagen2010-09-102-4/+4
| | | | | | | | | | | | Task-number: QTBUG-13466
| | * Implement a private API for setting title widgetsHarald Fernengel2010-09-1010-52/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102-3/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | qint64/quint64 in Windows registry. Reviewed-by: Prasanth Ullattil Reviewed-by: Joerg Bornemann Task: QTBUT-13249 AutoTest: Included
| | * fix CRLFHarald Fernengel2010-09-101-9/+9
| | |
| | * 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-102-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-102-2/+2
| | | | | | | | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-106-107/+52
|\ \ \ | |/ / |/| | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotests cleanup.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-106-107/+52
| |\ \ | | |/ | |/| | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotests cleanup.
| | * Autotests cleanup.Yann Bodson2010-09-106-107/+52
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1038-9/+2376
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Fixed compiler warnings in meego graphics system helper.Samuel Rødal2010-09-103-13/+13
| | | |
| * | | Added meego graphics system helper to features/qt.prf and syncqt.Samuel Rødal2010-09-103-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | MeeGo graphics system helper headers are now synced and the correct include path and libraries are added to an application by doing QT += meegographicssystem helper in the .pro file.
| * | | Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-106-26/+55
| | | | | | | | | | | | | | | | Also, this prevents hard-coding the path to the meego plugin.
| * | | Updated license headers for meego graphics system helper.Samuel Rødal2010-09-1012-84/+408
| | | |
| * | | Fixed compilation and API of meego graphics system helper.Samuel Rødal2010-09-1014-228/+224
| | | |
| * | | Renamed meego graphics system helper files.Samuel Rødal2010-09-1013-0/+0
| | | |
| * | | Imported meego graphics system helper sources.Samuel Rødal2010-09-1013-0/+1001
| | | | | | | | | | | | | | | | From http://www.gitorious.com/meego-graphics/meego-graphics
| * | | 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-104-27/+72
| |\ \ \
| | * | | 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-102-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102-4/+28
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch '4.6-s60' into 4.7-s60axis2010-09-100-0/+0
| |\ \ \ \
| | * | | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-102-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 (cherry picked from commit 5cef786a651c675d3428060a19bfd9d9ecee6083)
| * | | | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-102-4/+28
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-103-26/+68
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotest for QTBUG-13454. Changing the Image 'source' should not go through the 'Loading' state if the image is cached.
| * | Autotest for QTBUG-13454.Yann Bodson2010-09-102-16/+55
| | |
| * | 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
generated by cgit v0.12 at 2025-08-26 01:06:14 (GMT)