summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-253-4/+9
| | | | Reviewed-by: TrustMe
* Merge remote branch 'mainline/4.7' into 4.7Jiang Jiang2011-05-2431-498/+644
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-2211-215/+215
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Absenting function in winscw def files.
| | * Absenting function in winscw def files.Laszlo Agocs2011-05-2011-215/+215
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-05-202-22/+61
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix ligature offset in multi-line text Make selection work across ligatures
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-203-36/+33
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Notify when the TextInput cursorRectangle property changes within pre-edit
| | * | Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-203-36/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Anything that updates the horizontal scroll is also likely to change the position of the cursor rectangle and the micro focus. So group these actions together and ensure they're done before emitting cursorPositionChanged() so positionToRectangle() returns a valid value from that handler. Change-Id: I5fadc58efb148a8dabe88a94381c86cd64dba3bd Task-number: QTBUG-19089 Reviewed-by: Martin Jones
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-191-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix brush transform in QtDirectFB backend, fixing QTBUG-18577
| | * | | Fix brush transform in QtDirectFB backend, fixing QTBUG-18577Denis Oliver Kropp2011-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1224 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-192-137/+299
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: directfb: Paint engine enhancements
| | * | | directfb: Paint engine enhancementsDenis Oliver Kropp2011-05-192-137/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support negative scaling using DSBLIT_FLIP_HORIZONTAL/VERTICAL (DirectFB >= 1.4.3). - Implement drawing points. - Implement rectangular path filling. - Discard drawing when alpha is zero with SrcOver. - Also use DirectFB StretchBlit() if supported by hardware. - Unify/simplify pen/brush/composition support handling. - Enhance output when printing raster fallbacks. - Other minor cleanups. Merge-request: 991 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-1812-57/+44
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing Linux compatibility issues for Symbian
| | * | | | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-1812-57/+44
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Laszlo Agocs
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-05-181-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix broken drawing with large fonts using QStaticText and FreeType
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-183-51/+51
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Re-apply licenseheader text in source files for qt4.7
| | * | | | | Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-05-183-51/+51
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
* | | | | | Fix xToCursor issue due to backporting from 4.8Jiang Jiang2011-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19260 Reviewed-by: TrustMe
* | | | | | Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-234-7/+99
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to find out the closest element in the ligature to the point we clicked (or tapped), currently we do this by dividing the width of that ligature glyph evenly by the number of characters it covered. We only support Common and Greek script at this point, ligatures in other scripts are still handled as a whole. Task-number: QTBUG-19260 Reviewed-by: Eskil
* | | | | Fix ligature offset in multi-line textJiang Jiang2011-05-202-2/+19
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil
* | | | | Make selection work across ligaturesJiang Jiang2011-05-201-21/+43
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For widgets like QPlainTextEdit, selection across ligatures (typically 'fi', 'ffi', 'fl', etc.) end up highlighting the entire ligature glyphs, this patch fixed that by dividing width inside the ligature so that selection will not expand past the actual selected characters. Since cursor position already considered this, we merely adopted the algorithm and made it a separated helper function for all necessary cases. Dividing width directly looks like a temporary workaround but works well enough so far for cursor positions. Task-number: QTBUG-11969 Reviewed-by: Eskil (cherry picked from commit 99fd5825dfb4d50cff93165995701a65b7a8e4ed)
* | | | Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-181-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In FreeType, there's a fall back to QFontEngine::alphaMapForGlyph() when the fonts are very large. Since this uses a QPainterPath containing an unhinted glyph, the use of hinted metrics would sometimes lead to the glyphs being clipped because they would be positioned slightly outside the image they were painted into. When outline drawing is on, it makes sense to return unhinted metrics, since the glyphs we will actually use are unhinted. Task-number: QTBUG-19067 Reviewed-by: Jiang Jiang
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-177939-131573/+131580
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| * | | Updating file with CRLF line endings for the updated headerSergio Ahumada2011-05-171-29/+29
| | | | | | | | | | | | | | | | | | | | This file requires CRLF line terminators to pass the tst_moc test after a license update.
| * | | Fix a regression in QList::mid()Liang Qi2011-05-162-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't need to copy anything when pos is after size(). Task-number: QTBUG-19164 Reviewed-by: Oswald Buddenhagen
| * | | update gitignoreOswald Buddenhagen2011-05-131-2/+5
| | | |
| * | | remove -fno-stack-protectorOswald Buddenhagen2011-05-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | there is no need to disable stack protector unless one uses an ancient version of gcc. taken from kubuntu.
| * | | Fix make confcleanAnders Bakken2011-05-131-4/+4
| | | | | | | | | | | | | | | | | | | | Merge-request: 1227 Reviewed-by: ossi
| * | | Update licenseheader text in source filesJyri Tahtela2011-05-137936-131576/+131576
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-05-161-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug in meego graphics system runtime switching.
| * | | | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch when the last _visible_ widget is destroyed (and also switch back when a widget is mapped and there are no other visible widgets). Reviewed-by: Armin Berres
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-05-1518-174/+203
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Fix memory leak in QXmlQuery::setQuery. doc: Fixed QTBUG-19226 doc: Fixed QTBUG-19223 doc: Remved debug code for QTBUG-18791 doc: Fixed QTBUG-18791 doc: Fixed a QML snippet reference
| * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-13339-2707/+30191
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (241 commits) Fix memory leak in QXmlQuery::setQuery. QDeclarativeMouseArea: block context menu events ListViews loses items if all visible items are removed. Make TextEdit word selection more natural. Clear confusion between QMainWindow and QMainWindowLayout. Fix for rounded corners bug in QMenu QWidgetPrivate::setParent_sys might be using null pointer Ensure the TextEdit cursor delegate is repositioned on mouse events. Don't crash on an invalid replacementStart from an input method. Fix incorrect hardware address on systems without getifaddrs() Enable multisampling on Symbian if hw supports it Fix QtCoreu.def file error Introduce platform extension to QGraphicsSystem Fix Symbian/WinsCW build break Prevent crash in OpenGL engine when scaling images / pixmaps. emit QNetWorkAccessManager::finished on QNetworkReply::abort() Fix -no-gui Don't run XLib check if -no-gui is used Ukrainian translation updated fix random miscompilation with msvc ...
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-1310-156/+185
| | |\ \ \ \ \
| | * | | | | | Fix memory leak in QXmlQuery::setQuery.Niklas Kurkisuo2011-05-138-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a circular reference dependency between VariableDeclaration and the classes EvaluationCache, ExpressionVariableReference and TemplateParameterReference. By removing the explicitly shared pointer of VariableDeclaration in these classes the circle is broken and memory is freed correctly. Task-number: QT-4106 Integrated-by: David Boddie
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-121-3/+9
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: doc: Fixed QTBUG-19226 doc: Fixed QTBUG-19223
| | * | | | | | doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| | | | | | | |
| | * | | | | | doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| | | | | | | |
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-121-26/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: doc: Remved debug code for QTBUG-18791
| | * | | | | | doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| | | | | | | |
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-119-145/+193
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: doc: Fixed QTBUG-18791
| | * | | | | | doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| | | | | | | |
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-05-092-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: doc: Fixed a QML snippet reference
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-091-1/+1
| | |\ \ \ \ \ \
| | * | | | | | | doc: Fixed a QML snippet referenceMartin Smith2011-05-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated the Config class for reuse.
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-135-40/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix instability in QNetworkConfigurationManager autotest Support word selection list with predictive text from splitview Fix softkey icon positioning in S60 5.3
| * | | | | | | Fix instability in QNetworkConfigurationManager autotestShane Kearns2011-05-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QThread::isFinished() can return false after the finished() signal is emitted, so test the event loop's timeout() function instead. Don't compare prescan configurations, as these may be cached by the OS. It was causing the test to fail on linux if run before any other network test. Reviewed-by: mread
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-05-131-15/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Fix softkey icon positioning in S60 5.3Miikka Heikkinen2011-05-131-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60 5.3, Avkon apparently expects softkey icons to be 32x32 and positions them accordingly into the softkey, instead of needing the application to supply the whole softkey image. Fixed by skipping the softkey image centering when S60 version is 5.3 or larger. Task-number: QTBUG-19104 Reviewed-by: Sami Merila
| * | | | | | | | Support word selection list with predictive text from splitviewSami Merila2011-05-133-23/+28
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When splitview is active and user taps a predicted word, mouse button should be forwarded to m_pointerHandler, which opens a suggested word list. When splitview is not active, but there are HW QWERTY keys in the device, tapping a word, should only move the cursor. Without HW QWERTY and no splitview, native editing state handles the functionality. Task-number: QTBUG-19062 Reviewed-by: Miikka Heikkinen
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-136-4/+131
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeMouseArea: block context menu events ListViews loses items if all visible items are removed.