summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-2860-684/+1800
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (31 commits) Make QtQuick2 compile on QPA Use maximum ascent/descent/leading from fallback fonts in shaping Another ugly hack to make bidi cursor work with Core Text Make sure layoutData exist before checking for string direction Removed warning from QPixmap::handle(). Take leading space width into account for painting and selection doc: Simplify language in QGlyphs docs doc: Minor cleanup in QGlyphs docs Remove extra comma at the end of enum list Fix compilation with Qt3Support Don't transform glyph positions for Core Graphics paint engine Skip linearGradientSymmetry test on QWS. Turn on HarfBuzz support for Mac/Cocoa Support visual cursor movement for BIDI text Disable tst_QPixmap::onlyNullPixmapsOutsideGuiThread on Mac Revert "Switch the default graphics system to raster on Mac." Fix an race condition in the auto test. Made linearGradientSymmetry test pass on qreal=float platforms. Make sure #ifdef'd tests still have main() function Long live QRawFont! ...
| * Merge remote branch 'qt-fire-review/master'aavit2011-04-2827-144/+253
| |\
| | * Make QtQuick2 compile on QPAEskil Abrahamsen Blomfeldt2011-04-2721-126/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the logic to set pixel size into the font engines to avoid making the platform plugin interface too complex, and added a function in QPA to make an isolated font engine based on font data. Currently none of the QPA back-ends supports it, but it compiles and spits out a warning if you try to create a QRawFont from data there. This isn't used in QtQuick2 anyway. Reviewed-by: Jiang Jiang
| | * Use maximum ascent/descent/leading from fallback fonts in shapingJiang Jiang2011-04-276-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When shaping a QScriptItem with a multi font engine, currently we only take the ascent/descent/leading from the primary (first) font engine in that multi font engine, however, subsequent engines used during shaping may have larger ascent/descent/leading, disregarding them may cause clipping issues in some cases. It's fixed by checking each font engine used in the shaping process and take the maximum value instead of the first one. On ATSUI we merely make it compile. Task-number: QTBUG-16719 Reviewed-by: Eskil
| | * Another ugly hack to make bidi cursor work with Core TextJiang Jiang2011-04-271-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the text is wrapped with LRE/LRO/RLE/RLO override/embed marks, Core Text in Mac OS X 10.5 doesn't produce an empty glyph at the beginning of the glyphs (while it does in Mac OS X 10.6), thus we need to prepend an empty glyph here, otherwise cursor position calculation will consider the first two characters as a ligature of the same glyph. Reviewed-by: Eskil
| | * Make sure layoutData exist before checking for string directionJiang Jiang2011-04-271-0/+2
| | | | | | | | | | | | | | | | | | Otherwise accessing that through QTextEngine::alignLine may cause crash. Reviewed-by: Samuel Rødal
| | * Removed warning from QPixmap::handle().Samuel Rødal2011-04-261-6/+2
| | | | | | | | | | | | | | | | | | | | | With the new fromX11Pixmap function there are valid use-cases where checking the handle() is useful also with the raster graphicssystem. Reviewed-by: Thiago Macieira
| | * Take leading space width into account for painting and selectionJiang Jiang2011-04-262-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | When painting horizontally centered RTL text and selection with trailing spaces, we need to take that space width into account because line.textAdvance doesn't include it. Task-number: QTBUG-18612 Reviewed-by: Eskil
| * | Merge remote branch 'qt-mainline/master'aavit2011-04-26330-11440/+25412
| |\ \ | | | | | | | | | | | | | | | | Conflicts: configure
| * \ \ Merge branch 'master' of scm.dev.troll.no:qt/qt-fire-reviewEskil Abrahamsen Blomfeldt2011-04-2336-541/+1548
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/gui/text/qglyphs.cpp
| | * | doc: Simplify language in QGlyphs docsEskil Abrahamsen Blomfeldt2011-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Mainly to trigger CI. Reviewed-by: TrustMe
| | * | doc: Minor cleanup in QGlyphs docsEskil Abrahamsen Blomfeldt2011-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a minor clean-up in the QGlyphs docs. Mainly to try to trigger CI. Reviewed-by: TrustMe
| | * | Remove extra comma at the end of enum listJiang Jiang2011-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It fails compilerwarnings test. Reviewed-by: TrustMe
| | * | Fix compilation with Qt3SupportJiang Jiang2011-04-191-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Fabien Freling
| | * | Don't transform glyph positions for Core Graphics paint engineJiang Jiang2011-04-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it already transformed text positions based on transform matrix on QPainter. Reviewed-by: Eskil
| | * | Turn on HarfBuzz support for Mac/CocoaJiang Jiang2011-04-192-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible to enable HarfBuzz text layout on Mac by either: - Set QT_ENABLE_HARFBUZZ environment variable when running a Qt app. - configure with -harfbuzz to build Qt, then HarfBuzz support will be turned on by default. HarfBuzz will only be used when the font explicitly requested is supported by HarfBuzz (aka. TrueType/OpenType font), other fonts (AAT fonts) will still be handled by Core Text. Using HarfBuzz for text layout will hopefully solve most tricky complex text shaping bugs on Mac. Task-number: QTBUG-17728 Reviewed-by: Eskil
| | * | Support visual cursor movement for BIDI textJiang Jiang2011-04-1914-272/+627
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bidi input can in some contexts be more intuitive if the cursor works in visual way: pressing left arrow key always make cursor move one character to the left regardless the language of text, pressing right arrow key always make cursor move to the right. It is also the behavior of Mac OS X. Based on the above reason and requests from Symbian we implemented this support for visual movement in BIDI text. 3 public properties are added to QTextDocument, QTextLayout and QLineEdit respectively: - QTextDocument::defaultCursorMoveStyle can be used to control the cursor behavior in all widgets based on QTextDocument, like QTextEdit, QPlainTextEdit, etc. When set to QTextCursor:: Visual, it will enable visual movement for all the cursors in the corresponding text edit. Default is QTextCursor::Logical. - QTextLayout::cursorMoveStyle is used for low-level cursor manipulation. When set to Visual, it will enable visual movement behavior for all the cursor related methods, including cursorToX, xToCursor and drawCursor. Default is Logical. - QLineEdit::cursorMoveStyle is used to control cursor movement behavior in QLineEdit. Default is Logical.: Task-number: QTBUG-13859 Reviewed-by: Eskil
| | * | Revert "Switch the default graphics system to raster on Mac."Fabien Freling2011-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a5d40fd3814ab7c8e865912c03a918bfd5994998. We have to fix the regressions due to the raster engine before putting it by default.
| | * | Long live QRawFont!Eskil Abrahamsen Blomfeldt2011-04-1536-382/+2672
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGlyphs API was initially attempted with a bastardization of QFont which was meant to encapsulate a single, physical font instance (a QFontEngine) where a set of glyph indexes would make sense. This is not how QFont was intended to be used, and it caused several issues. At the same time, the requirement for loading a font from ttf/otf data and be able to access it and use it without polluting the rest of the process with the font arose. To support these two APIs we introduce QRawFont, which is an abstraction on top of a single physical font. Done-with: Jiang Jiang
| | * | Another attempt at fixing the MSVC2005 build.Samuel Rødal2011-04-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently direct casting is illegal there too, even though they don't have the cast operators. Reviewed-by: Kim
| | * | Compile fix in qdrawhelper_sse2.cpp for MSVC 2005.Samuel Rødal2011-04-141-0/+5
| | | |
| | * | Compile fix in qdrawhelper_sse2.cpp.Samuel Rødal2011-04-141-1/+1
| | | |
| | * | Added support for six-parameter radial gradients.Samuel Rødal2011-04-1317-128/+489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extended radial gradients conform to the radial gradient specification in HTML 5 canvas. Task-number: QTBUG-14075 Reviewed-by: Andreas Kling
| | * | Improved gradient table generation performance for two-stop gradients.Samuel Rødal2011-04-135-72/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two stops is a fairly common case so we gain quite a bit by special casing it. Improves performance by 10 % in parcycle benchmark, and by 90 % in a synthetic benchmark. Reviewed-by: Andreas Kling
| | * | Optimized radial gradient fetch using SSE 2.Samuel Rødal2011-04-133-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On an i7 this improves performance by 22 % in parcycle, 107 % in default svgviewer example, and 283 % in a synthetic radial gradient benchmark. Reviewed-by: Andreas Kling
| | * | Improved qt_gradient_clamp for reflect spreads.Samuel Rødal2011-04-131-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using GRADIENT_STOPTABLE_SIZE * 2 as the modulo gives more correct behaviour, and also improves performance slightly. Reviewed-by: Benjamin Poulain
| | * | Prepared for SIMD implementation of radial gradients.Samuel Rødal2011-04-132-177/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the radial gradient fetch func into a template to be able to optimize the inner loop using SIMD instructions. Reviewed-by: Benjamin Poulain
| | * | Fix a race condition when the main window is being destructed.Fabien Freling2011-04-122-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the destructor of QWidget, we delete the layout. If the layout is not set to 0 afterwards, a check on the layout might turn true, but any access will end with a segfault. Reviewed-by: João Abecasis
| | * | Switch the default graphics system to raster on Mac.Fabien Freling2011-04-111-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Lars Knoll
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-04-2711-70/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Specify swap behavior preserved bit in openvg engine. Ignore changes to selectByMouse during a selection. PathView offset out of sync with currentIndex when items are removed. Move the TextInput cursor delegate when the preedit position changes. Add new exported symbol to QtGuiu.def Input method hints are not correct if using proxy widget Fix for GL graphcics system orientation which Update Symbian platform notes documentation Handle uppercase 'E' when parsing numbers in SVGs. Let QTextLine decide its own x position in QPainter Support text decoration in QML when using static text back-end Fix missing color in text when using static text back-end in QML
| * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-271-4/+5
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-271-4/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Specify swap behavior preserved bit in openvg engine.
| | | * | | | Specify swap behavior preserved bit in openvg engine.Laszlo Agocs2011-04-271-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike OpenGL, the EGL_SWAP_BEHAVIOR_PRESERVED_BIT was not set for the EGL configuration used with OpenVG. Yet the preserved swap was enabled still, which, according to the EGL spec, should fail. To make sure it still works with other EGL implementations, the bit is now set in the configuration. Reviewed-by: Jani Hautakangas
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-2710-66/+75
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp src/s60installs/eabi/QtGuiu.def
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-274-14/+19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Ignore changes to selectByMouse during a selection. PathView offset out of sync with currentIndex when items are removed.
| | | * | | | | Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-273-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the value of selectByMouse at the time of a mouse press event in all subsequent mouse events in a sequence. This is the same as ignoring the intial mouse press except mouse events for other actions are still accepted. Change-Id: I59b50bf95d26c6320e6e74eeb679b4153e0edf4d Task-number: QTBUG-18887 Reviewed-by: Martin Jones
| | | * | | | | PathView offset out of sync with currentIndex when items are removed.Martin Jones2011-04-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the view is animating due to currentIndex change and items are removed the target offset must be recalculated. Change-Id: Iee105712488070c086a24561a49daf17bcf14076 Task-number: QTBUG-18825 Reviewed-by: Michael Brasser
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-1/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move the TextInput cursor delegate when the preedit position changes.
| | | * | | | | Move the TextInput cursor delegate when the preedit position changes.Andrew den Exter2011-04-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7150122444e465ffbcc02e921d42d01c2dfdac1 Task-number: QTBUG-18892 Reviewed-by: Martin Jones
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-268-37/+54
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add new exported symbol to QtGuiu.def Handle uppercase 'E' when parsing numbers in SVGs. Let QTextLine decide its own x position in QPainter Support text decoration in QML when using static text back-end Fix missing color in text when using static text back-end in QML
| | | * | | | | | Add new exported symbol to QtGuiu.defEskil Abrahamsen Blomfeldt2011-04-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build on Symbian Reviewed-by: Jason Barron
| | | * | | | | | Handle uppercase 'E' when parsing numbers in SVGs.Kim Motoyoshi Kalland2011-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4881 Reviewed-by: Samuel
| | | * | | | | | Let QTextLine decide its own x position in QPainterJiang Jiang2011-04-194-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that it can take trailing space width into account when doing right aligned text drawing. Backported from master. Task-number: QTBUG-18303 Reviewed-by: Eskil
| | | * | | | | | Support text decoration in QML when using static text back-endEskil Abrahamsen Blomfeldt2011-04-182-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the QStaticTextItem code path in QML was copy-pasted, QStaticText did not support text decoration yet. It has since been implemented. We copy-paste the fix as well (which means we have to export a private function from QtGui to avoid duplicating that code as well.) Task-number: QTBUG-18428 Reviewed-by: Jiang Jiang
| | | * | | | | | Fix missing color in text when using static text back-end in QMLEskil Abrahamsen Blomfeldt2011-04-182-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using QStaticTextItem as a back-end for QML text on GL caused a regression where parts of a text element would get the wrong color. This was because the color set on the painter which was passed into draw() was never transferred to the painter used to record the draw text calls issued by the underlying QTextLayout::draw()-function. Task-number: QTBUG-18428 Reviewed-by: Jiang Jiang
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-262-36/+25
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Input method hints are not correct if using proxy widget Fix for GL graphcics system orientation which Update Symbian platform notes documentation
| | | * | | | | | Input method hints are not correct if using proxy widgetSami Merila2011-04-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Input context should prefer focus proxy over regular focus widget. Task-number: QTBUG-18873 Reviewed-by: Miikka Heikkinen
| | | * | | | | | Fix for GL graphcics system orientation whichJani Hautakangas2011-04-261-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL context needs to be recreated on Symbian when orientation changes. Previously only the EGL surface was recreated which wasn't enough. Task-number: QTBUG-18850 Reviewed-by: Samuel Rødal
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-273-3/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix warning about ASCII cast in calling QString::contains Fix warnings on unused parameters and variables Cleaned up benchmark project files.
| * | | | | | | | Fix warning about ASCII cast in calling QString::containsThiago Macieira2011-04-261-1/+1
| | | | | | | | |
generated by cgit v0.12 at 2025-01-23 01:59:09 (GMT)