- 13 Nov, 2014 - 1 commit
-
-
Eskil Abrahamsen Blomfeldt authored
The font caches can only be used from a single thread at a time. QFontEngineFT for instance, uses a global static thread storage which is accessed on releasing and creating engines, and this causes a crash if the font engine is created on one thread and released on another. We use the updatePolish() function to make sure the caches are empty before entering updatePaintNode(), and then we invalidate the cache again after updatePaintNode() is done. [ChangeLog][Text] Fixed uncommon crash in text nodes. Change-Id: I01dbc2ed58aeebd03d77a157c700330334bdb385 Task-number: QTBUG-38800 Reviewed-by:
Konstantin Ritt <ritt.ks@gmail.com>
-
- 25 Aug, 2014 - 1 commit
-
-
Jani Heikkinen authored
- Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by:
Jani Heikkinen <jani.heikkinen@digia.com>
-
- 03 Dec, 2013 - 1 commit
-
-
J-P Nurmi authored
QTextDocument::baseUrl was introduced in qtbase commit 1f22c1d. The ultimate goal is to get rid of QQuickTextDocumentWithImageResources and eventually make QQuickTextEdit's document interchangeable. Change-Id: Ibafeecc395b52f7200d8164f809bf76538e5620c Reviewed-by:
Alan Alpert <aalpert@blackberry.com>
-
- 30 Sep, 2013 - 1 commit
-
-
Gunnar Sletta authored
Change-Id: I3750c47640bf21c3567c5fa1c4667e3e2552942e Reviewed-by:
Lars Knoll <lars.knoll@digia.com>
-
- 12 Sep, 2013 - 1 commit
-
-
Jocelyn Turcotte authored
This is necessary for the QtWebEngine module. This also adds an empty nokeywords test using the same mechanism as qtbase/tests/auto/tools/moc/no-keywords.h to find conflicts at compile time. Change-Id: I9df541720797dd61f078178c2af68ead18ff8bfe Reviewed-by:
Simon Hausmann <simon.hausmann@digia.com>
-
- 18 Jun, 2013 - 1 commit
-
-
J-P Nurmi authored
Task-number: QTBUG-30804 Change-Id: I6c6993b152285f4bdf34d6e1aa04f25fa7ca41e0 Reviewed-by:
Alan Alpert <aalpert@blackberry.com>
-
- 10 Jan, 2013 - 1 commit
-
-
Sergio Ahumada authored
Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by:
Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by:
Sergio Ahumada <sergio.ahumada@digia.com>
-
- 23 Sep, 2012 - 1 commit
-
-
Iikka Eklund authored
Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by:
Lars Knoll <lars.knoll@digia.com>
-
- 16 Jul, 2012 - 1 commit
-
-
Yann Bodson authored
We don't need to relayout in painting thread. Task-number: QTBUG-26361 Change-Id: Idfad1b90e2772e72411df821d02ea596a094f508 Reviewed-by:
Andrew den Exter <andrew.den-exter@nokia.com>
-
- 10 Jul, 2012 - 1 commit
-
-
Eskil Abrahamsen Blomfeldt authored
For old-style (desktop components) apps using QML 2 on regular density displays, distance field text will look out of place. We introduce an option to use the native rasterizer instead if you would rather have native look and feel than scalable text items. Change-Id: Idb38e3c89f2deab9ae1963357c6c5fb235ddeab8 Reviewed-by:
Jiang Jiang <jiang.jiang@nokia.com>
-
- 08 Jul, 2012 - 1 commit
-
-
Andrew den Exter authored
Improve checks for geometry changes that don't affect layout, i.e width increasing when the previous layout didn't wrap or elide. Set implicit sizes just once during layout rather than setting the implicit width during and the implicit height after to limit the when an implicit size change can change geometry. And if there are multiple layouts of the same text/font combination re-use cached layout data as much as possible by guarding against unnecessary property changes on the layout, and not creating a new layout for calculating the implicit size of truncated text. Change-Id: Ia05e52e9170e1f5d3364896ab119e00d8a318299 Reviewed-by:
Michael Brasser <michael.brasser@nokia.com>
-
- 25 Jun, 2012 - 1 commit
-
-
Andrew den Exter authored
Adjust the mouse position to compensate for any alignment offsets and test the elided text layout for anchors if none is found in the normal layout. Change-Id: Idfda3f7e372d0f2d6c1b7bb5f22d7015d52e8239 Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
- 20 Apr, 2012 - 1 commit
-
-
Andrew den Exter authored
Relic from a prospective change to defer layout of text in more circumstances. Change-Id: I75d14e8cb01b86ab36ddbf58da99ba1cde14d801 Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
- 16 Apr, 2012 - 1 commit
-
-
Andrew den Exter authored
Update the baselineOffset when short cutting layout due to an empty text property. And allow alterations to the baseline due to images, font scaling and custom layouts when doing a layout. Task-number: QTBUG-24303 Change-Id: I5a31a6108cded490fef8b0674e15558ea4e22d6b Reviewed-by:
Michael Brasser <michael.brasser@nokia.com>
-
- 01 Mar, 2012 - 2 commits
-
-
Andrew den Exter authored
Task-number: QTBUG-24521 Change-Id: Idd451d0a8a238a60691386726e34054c0368b658 Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
Yann Bodson authored
Move less used members to an extra struct lazily allocated Change-Id: I87e464af4b9d29303705dd7e766f734309ed7763 Reviewed-by:
Andrew den Exter <andrew.den-exter@nokia.com>
-
- 29 Feb, 2012 - 1 commit
-
-
Andrew den Exter authored
Painting issues in QtQuick1 meant drawing had to be aligned to pixel boundaries, since this is no longer a problem we should use qreal everywhere. Change-Id: I58e88e10270fa603170f1cedf471bfb53bd89b73 Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
- 24 Feb, 2012 - 1 commit
-
-
Matthew Vogt authored
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
- 23 Feb, 2012 - 1 commit
-
-
Yann Bodson authored
Calculate the font size correctly even when the size is specified in pixels and update this size when the font changes. Also make sure that the text layout's font is set before parsing. Task-number: QTBUG-24458 Change-Id: Ida7723f6e4f4b9fd3a6878076f4beaf5bda8f7f7 Reviewed-by:
Andrew den Exter <andrew.den-exter@nokia.com>
-
- 21 Feb, 2012 - 1 commit
-
-
Andrew den Exter authored
Remove some unnecessary members, store colors as QRgb values instead of QColor, and reorder members to minimise alignment padding. Change-Id: Id3958429008c97a5714734a529250fe881e2161b Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
- 20 Feb, 2012 - 1 commit
-
-
Aaron Kennedy authored
These were used when we were porting from QtQuick 1 to QtQuick 2 but are no longer necessary. Change-Id: I0eeb7e13b4affdd6ab6c6dddea760afcdf38ee4f Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
- 17 Feb, 2012 - 1 commit
-
-
Andrew den Exter authored
Query the elided text from the initial layout rather than doing a second layout of the line to be elided. Change-Id: I399f99a11046013c0c51add2e2f2dd14b959831a Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
- 16 Feb, 2012 - 1 commit
-
-
Andrew den Exter authored
Multi-length string eliding was provided by QFontMetrics::elidedText() which is no longer used for layouts. So we instead have to do the string substitution ourselves if the text doesn't fit before finally eliding. Change-Id: Iab2e54b332390290d656299a5be148f39f78df9d Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
- 09 Feb, 2012 - 1 commit
-
-
Andrew den Exter authored
Allows the color of links in text to be changed from the default blue. This currently only works with StyledText and the distance field rendererer. It could be made to work with RichText overwriting the specified foreground color in all instances or by not setting a default color in the html parser. The former would prevent the color being set with CSS or some future means for altering text formats. The latter would break rendering with QPainter. Task-number: QTBUG-23048 Change-Id: I98df215cabe8a089f648fd4a6206622b4318fb8f Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
- 07 Feb, 2012 - 2 commits
-
-
Andrew den Exter authored
For Text and TextEdit this is a rename of paintedWidth and paintedHeight both of which remain as synonyms of the content properties for compatability. For TextInput this is a new property. Task-number: QTBUG-23691 Task-number: QTBUG-15160 Change-Id: Idbdc72fad34922be21b649ca45fc39b5e533ed1a Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
Yann Bodson authored
Task-number: QTBUG-24033 Change-Id: Ifa24482b98536300c2f4c643a86517a019de8a84 Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
- 06 Feb, 2012 - 1 commit
-
-
Andrew den Exter authored
This adds a mode where if the content of a Text item doesn't fit within its bounds the font size is reduced during layout until it does or a minimum font size is reached. Task-number: QTBUG-22832 Change-Id: I6198ef03899e2f21b32e313548966ef4b0e3bff1 Reviewed-by:
Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
- 02 Feb, 2012 - 1 commit
-
-
Yann Bodson authored
Task-number: QTBUG-21793 Change-Id: Ie7b9f293c6c9a949c1899152c38b61251b0069d3 Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
- 30 Jan, 2012 - 1 commit
-
-
Jason McDonald authored
As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by:
Rohan McGovern <rohan.mcgovern@nokia.com>
-
- 24 Jan, 2012 - 1 commit
-
-
Eskil Abrahamsen Blomfeldt authored
Use a shared graphics cache to back the distance fields if it is available. Change-Id: Id5e6e7a28e38e349d787e66016b2d0faebc791d7 Reviewed-by:
Jiang Jiang <jiang.jiang@nokia.com>
-
- 23 Jan, 2012 - 1 commit
-
-
Jason McDonald authored
Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by:
Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by:
Alan Alpert <alan.alpert@nokia.com>
-
- 19 Jan, 2012 - 2 commits
-
-
Andrew den Exter authored
Specifies the base URL which embedded links in rich text are resolved against. By default this is the URL of the item. Task-number: QTBUG-23655 Change-Id: Ib51b8503a18d9ac4e1801c77b77b3595d8f4912a Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
Andrew den Exter authored
Override QTextImageHandler's image loading as it will attempt to resolve relative paths and load the image itself if the document returns an invalid image from loadResource, which we don't want as it bypasses the pixmap cache and resolves against the application and current working directory instead of the Text items context. Change-Id: Ia1d3633036f96d902e1ac03dae5d5b203fba7ff1 Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
- 05 Jan, 2012 - 1 commit
-
-
Jason McDonald authored
Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by:
Rohan McGovern <rohan.mcgovern@nokia.com>
-
- 20 Dec, 2011 - 1 commit
-
-
Martin Jones authored
Change-Id: Ie92129887730d3738e14116cf22e1c30b836a415 Reviewed-by:
Michael Brasser <michael.brasser@nokia.com> Reviewed-by:
Martin Jones <martin.jones@nokia.com>
-
- 07 Dec, 2011 - 1 commit
-
-
Andrew den Exter authored
Re-use the QQuickTextDocumentWithImageResources class from Text to allow image resources to be loaded from the pixmap cache. Change-Id: I13170eefe664447b77f2980fb2fe7b4e2f8eb81c Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
- 02 Dec, 2011 - 1 commit
-
-
Kent Hansen authored
This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by:
Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by:
Kent Hansen <kent.hansen@nokia.com> Reviewed-by:
Sergio Ahumada <sergio.ahumada@nokia.com>
-
- 28 Nov, 2011 - 1 commit
-
-
Martin Jones authored
Task-number: QTBUG-22920, QTBUG-22116 Change-Id: Ibe78ce1b0b438eec32955b986a8740f173cd082f Reviewed-by:
Yann Bodson <yann.bodson@nokia.com>
-
- 21 Oct, 2011 - 1 commit
-
-
Kent Hansen authored
The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by:
Kent Hansen <kent.hansen@nokia.com>
-
- 11 Oct, 2011 - 1 commit
-
-
Yann Bodson authored
Allow more control over the text layouting process in QML. Give access to every text line through a hook, this gives the opportunity to position and resize a line as it is being laid out. It is then possible to lay out the text in columns or around other objects. Task-number: QTBUG-21367 Change-Id: I56dc0c1c4b575dc06360c135098024d0324d3656 Reviewed-on: http://codereview.qt-project.org/5351 Reviewed-by:
Yann Bodson <yann.bodson@nokia.com> Sanity-Review: Yann Bodson <yann.bodson@nokia.com>
-