summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QSslConfiguration documentation fixTaito Silvola2011-05-051-2/+2
| | | | | | | setPeerVerifyMode() and peerVerifyMode() comments fix Merge-request: 1220 Reviewed-by: Peter Hartmann
* Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-052-18/+33
| | | | | | | | | | | | | | | | | This case may be triggered in the (admittedly slightly abnormal) case where a user wishes to embed the calendar widget in a layout or, for whatever reason, do something else that will change its ownership. We work around this by detecting when it is deleted and recreating the widget. This will also have a positive side effect if setCalendarWidget() is called with a widget which is then subsequently deleted, returning the default widget instead of a pointer to (now deleted) memory. Reviewed-by: Denis Dzyubenko Merge-request: 2568 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* HTTP cache backend: do not load resources that must be revalidatedPeter Hartmann2011-05-041-2/+7
| | | | | | | | | | | The header field "Cache-Control: must-revalidate" is a strict requirement for loading the resource from the server, and not reading it from the cache without revalidating first. With this patch, PreferCache will load such from the network instead of loading them from the cache, and AlwaysCache will throw a ContentNotFound error. Reviewed-by: Markus Goetz Task-number: QTBUG-18983
* HTTP backend: do not load resources from cache that must be revalidatedPeter Hartmann2011-05-041-7/+5
| | | | | | | | | | | The header field "Cache-Control: must-revalidate" is a strict requirement for loading the resource from the server, and not reading it from the cache without revalidating first. With this patch, PreferCache will load such from the network instead of loading them from the cache, and AlwaysCache will throw a ContentNotFound error. Reviewed-by: Markus Goetz Task-number: QTBUG-18983
* Compile fix for QLocale on Symbian.Denis Dzyubenko2011-05-041-1/+1
| | | | | | | The previous change added new ELangEnglish_India that doesn't necesserally present in all SDKs. Reviewed-by: trustme
* Added Kazakh language to the QLocale mapping table on Symbian.Denis Dzyubenko2011-05-041-0/+1
| | | | Reviewed-by: trustme
* Added support for QLocale::uiLanguages on Symbian.Denis Dzyubenko2011-05-041-70/+96
| | | | | | | | Extended the mapping table that matches symbian device languages to a locale name and language code. Task-number: QTBUG-7329 Reviewed-by: trustme
* Fix drawing text in item view:Olivier Goffart2011-05-031-0/+21
| | | | | | Put back code that was removed by mistake in e8019cf8feb402303e6d253f5ca58bebfda42679 Task-number: QTBUG-18998
* Fix compilationOlivier Goffart2011-05-031-1/+0
| | | | Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b
* Merge earth-team into origin/4.8Olivier Goffart2011-05-03158-1132/+4312
|\ | | | | | | | | Conflicts: configure
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-022-0/+22
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-022-0/+22
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix trailing whitespaces Fix for native child widget performance issue.
| | | * Fix trailing whitespacesJani Hautakangas2011-05-022-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| | | * Fix for native child widget performance issue.Jani Hautakangas2011-05-022-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flushing native child widgets in VG and GL window surfaces caused performance downgrade because unnecessary swapBuffers calls. On Symbian we must not support flushing native child widgets in VG and GL window surfaces because it causes GPU memory overhead and performance issues. Symbian graphics architecture allows us to render native child widgets to TLW EGL surface correctly in most of the cases. Task-number: QTMOBILITY-1570 Reviewed-by: Samuel Rødal
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-026-3/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-291-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix another case where QVariant::Invalid should be QVariant::UserType
| | | * | Fix another case where QVariant::Invalid should be QVariant::UserTypeAndy Shaw2011-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the QMetaType change before 4.7.0, if the typename of the variant is QVariant then the type itself is of UserType and not Invalid as it was previously. Reviewed-by: Martin Petersson
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-291-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix missing glyphs for large fonts with QStaticText/GL/Freetype
| | | * | | Fix missing glyphs for large fonts with QStaticText/GL/FreetypeEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering fonts that are so large the Freetype engine will fall back to outline rendering, we would sometimes lose glyphs that were at the edge of the texture, because the width of the image returned by QFontEngine::alphaMapForGlyph() includes a margin (which the other font engines do not) and thus it would sometimes be wider than the available area in the cache's texture. This would in turn cause the GL call to copy the glyph into the cache to fail. The correct fix would probably be to make the algorithm used to calculate the width in QFontEngine::alphaMapForGlyph() the same as the algorithm used by the glyph cache (which would mean to remove the margin there), but to minimize the impact in a patch release, we fix the symptom and move the correct fix to next minor release instead. Task-number: QT-4876 Reviewed-by: Jørgen
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-281-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash in raster on X11 when text contains unsupported characters
| | | * | Fix crash in raster on X11 when text contains unsupported charactersEskil Abrahamsen Blomfeldt2011-04-281-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would assume the font engine was a FT engine and do a static cast here, which would cause a crash if the box engine was in use instead. Task-number: QTBUG-17443 Reviewed-by: Samuel
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-04-2897-500/+1755
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def
| | * | | Upload VGImage data when drawing pixmaps that are being painted into.Laszlo Agocs2011-04-275-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a painter is open on a pixmap's underlying QVolatileImage, it is better to upload the VGImage content every time the pixmap is drawn on the screen, in order to enable showing animations that are created by continously rendering into the same pixmap and keeping the same painter open. Task-number: QT-4002 Reviewed-by: Jason Barron
| | * | | Make translucent windows working properly with OpenVG.Laszlo Agocs2011-04-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenVG engine correctly uses vgClear() to fill the surface with transparent pixels whenever the window has the WA_TranslucentBackground attribute enabled. However both scissoring and masking affects the operation of vgClear(). Drawing artifacts were previously visible due this, simply because scissoring was left enabled by the VG paint engine, and the filling with transparent pixels happens in the window surface's beginPaint() that is called between the paint engine's end() (for the previous paint) and begin() (for the next paint). Task-number: QT-4907 Reviewed-by: Jani Hautakangas
| * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-04-294-2/+61
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Legal: add the license header to the hand-edits Clear the root index when the model is reset. Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver:: Fixed QTBUG-11935
| | * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-284-2/+61
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-0/+5
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Clear the root index when the model is reset.
| | | | * | Clear the root index when the model is reset.Girish Ramakrishnan2011-04-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18839 Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6 Merge-request: 2598 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| | | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-27220-1452/+6401
| | | | |\ \
| | | * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-271-2/+6
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver:: Fixed QTBUG-11935
| | | | * | | | Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver::Emmanuel BOURGERIE2011-04-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tables() returns tables in all databases on the server" This bugfix has been rewritten to match contributors advise. Change-Id: I3a9cf900ff7eae47c9ffdbcf34bcb1b4396d9837 Merge-request: 1010 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| | | | * | | | Fixed QTBUG-11935Emmanuel BOURGERIE2011-04-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7bdb0ceecf2892f6be73d1816764a2bab6275f1 Merge-request: 1010 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-272-0/+50
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Legal: add the license header to the hand-edits
| | | | * | | | | Legal: add the license header to the hand-editsThiago Macieira2011-04-272-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-293-7/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed off-by-one in radial gradient color table index computation. Support more items for QTextCharFormat::VerticalAlignment enum for custom text objects.
| | * \ \ \ \ \ \ \ Merge remote branch 'qt-fire-review/master'aavit2011-04-283-7/+15
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed off-by-one in radial gradient color table index computation.Samuel Rødal2011-04-281-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clamp to GRADIENT_COLOR_TABLE-1, not GRADIENT_COLOR_TABLE-2. Fixes visible error in gradients.qps Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
| | | * | | | | | | | Support more items for QTextCharFormat::VerticalAlignment enum for custom ↵Dmitry Zelenkovsky2011-04-282-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text objects. * QTextCharFormat::AlignNormal - support text format descent, place text object bottom on (baseline - descent). * QTextCharFormat::AlignBottom - place text object bottom on baseline. * QTextCharFormat::AlignTop - Still not supported. * Any other vertical alignment is mapped QTextCharFormat::AlignBottom. Add new enum AlignBaseline for custom inline objects to take into account font baseline. Merge-request: 2578 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-04-2934-124/+935
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: (49 commits) Make QLineControl send accessibility updates. Fix warning (unused variable) in QAccessibility test. Add accessible events as defined by IAccessible2. Return name and allow actions for invisible accessible items. Skip child count test on Intel compiler. Removing the "resetInternalData" slot in QAbstractProxyModel Typos in internal api docs. Fix tst_QTableWidget::task219380_removeLastRow Fix tst_QTableWidget::task219380_removeLastRow Fixed a crash on Windows XP with mingw in threaded-code Totally kill MR 916 Fix licence headers again for MR 900 Reverting merge request 916 Reverting merge request 916 Build fix on QMenuBar Fix licence headers again for MR 900 Fix copyright and a few codestyle mistakes Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterface Make ctor and dtor of QAbstractMenuBarImpl inline QAbstractMenuBarImpl::allowSetVisible => setVisible ...
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream'Thierry Bastian2011-04-28142-1113/+7200
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Make QLineControl send accessibility updates.Frederik Gladhorn2011-04-277-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it emit the signals for the right object, it needs its parent to be the QGraphicsItem/SGItem/QLineEdit. According to IA2 it should emit TextUpdated and CursorMoved signals. TextChanged is deprecated. More fine grained signals would be desireable but this makes changes work at all. Reviewed-by: Morten Sorvig
| | * | | | | | | | | | | Add accessible events as defined by IAccessible2.Frederik Gladhorn2011-04-271-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional events from: http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html Reviewed-by: Morten Sorvig
| | * | | | | | | | | | | Return name and allow actions for invisible accessible items.Frederik Gladhorn2011-04-271-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason not to report the name or allow actions when a widget is invisible. Reviewed-by: Morten Sorvig
| | * | | | | | | | | | | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-262-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0916a68056154ecb60e4ea2c79726ab2e49b1532 and 6f1384fcbeea993d5be47590c696de60215b7608. This effectively reverts most of MR 694. Reviewed-by: Olivier
| | * | | | | | | | | | | Typos in internal api docs.Frederik Gladhorn2011-04-221-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master-upstream'Thierry Bastian2011-04-19793-82314/+55243
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fixed a crash on Windows XP with mingw in threaded-codeThierry Bastian2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The thread callback doesn't align the stack on 16-bytes on WinXP. That causes a crash when we call SSE code. So now we tell the compiler to force that alignment of the stack. Task: QTBUG-18631 Reviewed-By: Olivier
| | * | | | | | | | | | | | Totally kill MR 916Gabriel de Dietrich2011-04-1511-779/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... the hard way. Reviewed-by: Trust me
| | * | | | | | | | | | | | Fix licence headers again for MR 900Sergio Ahumada2011-04-142-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2 Reviewed-by: Gabriel de Dietrich
| | * | | | | | | | | | | | Reverting merge request 916Gabriel de Dietrich2011-04-147-58/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Introduce menubar plugin system" This reverts commits 56c3de426d97ab7c8fb..f7b60fffb673b182e63
generated by cgit v0.12 at 2024-11-12 16:48:05 (GMT)