Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix CI by recreating reference bitmaps for text comparison | Joona Petrell | 2010-10-19 | 9 | -0/+0 |
| | |||||
* | tst_qdeclarativetext: Regenerate the baselines after the merge. | Olivier Goffart | 2010-10-15 | 9 | -0/+0 |
| | | | | This need to be checked. | ||||
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-15 | 3 | -0/+0 |
|\ | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png | ||||
| * | Update reference bitmaps used in bitmap comparison tests to follow changes ↵ | Joona Petrell | 2010-10-13 | 3 | -0/+0 |
| | | | | | | | | | | | | in Text painting Task-number: QTBUG-14374 | ||||
* | | Align .pro with qmake: s/\.sources/.files/. | Miikka Heikkinen | 2010-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis | ||||
* | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 7 | -61/+61 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp | ||||
| * | Replace all occurances of "Qt 4.7" with "QtQuick 1.0" | Aaron Kennedy | 2010-09-29 | 7 | -61/+61 |
| | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones | ||||
* | | Fixed qdeclarativetext auto-test to work with raster graphicssystem. | Samuel Rødal | 2010-09-20 | 3 | -0/+0 |
|/ | | | | | | Updated the expected images in a few cases where the rounding differed. Reviewed-by: Eskil | ||||
* | Don't cause repaints during painting in Text element | Martin Jones | 2010-09-08 | 1 | -0/+11 |
| | | | | | | | | | | Calling prepareGeometryChange in a paint event is a bad idea and was causing jerky scrolling. There is no longer any need for the removed code since we don't use imgCache.size() to determine boundingRect() anymore. Task-number: QTBUG-13453 Reviewed-by: Joona Petrell | ||||
* | Bounding rect of text was not always calculated correctly. | Martin Jones | 2010-07-21 | 2 | -0/+37 |
| | | | | | | | | The boundingRect depended upon the image cache which may not become valid until after boundingRect is called. Task-number: QTBUG-12291 Reviewed-by: Michael Brasser | ||||
* | font.letterSpacing used percentage rather than absolute values. | Martin Jones | 2010-07-21 | 1 | -4/+4 |
| | | | | | | | ... and percentage is useless. Task-number: QTBUG-12282 Reviewed-by: Warwick Allison | ||||
* | Ensure the boundingRect() of Text is correctly calculated. | Michael Brasser | 2010-07-20 | 1 | -0/+1 |
| | | | | | | | We need to create our cached image in boundingRect() if it doesn't already exist, to prevents painting errors. Reviewed-by: Warwick Allison | ||||
* | Fix TextEdit bitmap tests testing the wrong element | Joona Petrell | 2010-07-02 | 1 | -3/+3 |
| | | | | | Task-number: Reviewed-by: Martin Jones | ||||
* | Fix TextInput text getting improperly clipped | Joona Petrell | 2010-07-02 | 1 | -1/+4 |
| | | | | | Task-number: QTBUG-11790 Reviewed-by: Martin Jones | ||||
* | Test only on X11, not only on Linux (which includes embedded). | Warwick Allison | 2010-06-25 | 1 | -2/+2 |
| | |||||
* | Force font selection (and so ensure visual test passes). | Warwick Allison | 2010-06-25 | 11 | -2/+7 |
| | |||||
* | Use ugly but reliable bitmaps fonts in test. | Warwick Allison | 2010-06-24 | 10 | -0/+1 |
| | |||||
* | Fix and better test Text / TextEdit alignments. | Warwick Allison | 2010-06-23 | 11 | -0/+108 |
| | | | | | | Various clipping and refresh bugs. Task-number: QTBUG-11492 | ||||
* | Make declarative autotests compile on Symbian abld build system | Joona Petrell | 2010-06-08 | 2 | -2/+6 |
| | | | | | Task-number: Reviewed-by: Martin Jones | ||||
* | Symbian build fix to declarative auto and benchmark tests | Joona Petrell | 2010-05-14 | 1 | -1/+8 |
| | | | | | Task-number: QTBUG-9491 Reviewed-by: Martin Jones | ||||
* | Fix versioning of Qt Declarative's in-built types | Alan Alpert | 2010-04-21 | 4 | -4/+4 |
| | | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081 | ||||
* | Emit runtime warnings through QDeclarativeEngine | Aaron Kennedy | 2010-04-19 | 1 | -2/+2 |
| | | | | QTBUG-9726 | ||||
* | Simplify dynamic resource loading to avoid cluttering Text API. | Warwick Allison | 2010-04-15 | 1 | -1/+5 |
| | | | | Task-number: QTBUG-9900 QT-3287 | ||||
* | Use qmlInfo for image loading errors, not qWarning(). | Warwick Allison | 2010-04-15 | 1 | -2/+2 |
| | | | | Task-number: QTBUG-9908 | ||||
* | Correctly resolve, and load, IMG tags in Text element. | Warwick Allison | 2010-04-15 | 7 | -0/+72 |
| | | | | | | Task-number: QTBUG-9900 Reviewed-by: Martin Jones | ||||
* | Make sure richtext wraps correctly with a fixed height set. | Martin Jones | 2010-04-15 | 1 | -0/+20 |
| | |||||
* | Rename remaining import Qt 4.6 lines to import Qt 4.7 | Joona Petrell | 2010-04-14 | 1 | -53/+53 |
| | | | | | Task-number: Reviewed-by: Martin Jones | ||||
* | Tweak tests to run in parallel | Aaron Kennedy | 2010-04-13 | 1 | -0/+3 |
| | |||||
* | Replace Text::wrap property with Text::wrapMode enumeration. | Martin Jones | 2010-04-08 | 1 | -4/+4 |
| | | | | wrap remains for a little while, and will produce a warning. | ||||
* | Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX ↵ | Leonardo Sobral Cunha | 2010-02-24 | 1 | -23/+23 |
| | | | | to QDeclarativeXXX. | ||||
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵ | Warwick Allison | 2010-02-24 | 2 | -0/+849 |
QDeclarativeXXX. |