summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativetext
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-222-0/+14
|\
| * Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-212-0/+14
| | | | | | | | | | | | | | | | | | The elided string was used to calculate the implicitWidth rather than the full string. Change-Id: I51b8800b47d4e32f4d5eef07c71df10e2df905b7 Task-number: QTBUG-18627 Reviewed-by: Michael Brasser
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-221-0/+18
|\ \ | |/
| * Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-211-0/+18
| | | | | | | | | | | | | | | | | | | | QRect::setY() affects the size of the rectangle, so the height of the bounding rect was too small. Use moveTop() instead, which does not affect the size of the rectangle. Change-Id: If41ba6a28c9a7370f054dab20995a198f822ae2b Task-number: QTBUG-18194 Reviewed-by: Bea Lam
| * Re-enable lineHeight tests.Yann Bodson2011-03-171-3/+3
| | | | | | | | | | | | These tests were disabled by 24d8e96624af91ab01a20c10625858300f16099b Change-Id: I5bf3e11dfb3c975415c3039b39a39c22984d2900
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-6/+98
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Fix failing testsBea Lam2011-03-101-0/+5
| | | | | | | | | | | | | | | | | | RTL text-related tests were failing on mac since QApplication::keyboardInputDirection() is not always initialized when the QApplication instance is created. Change-Id: Ifa7214ffb1941d824a9425015b38aa77366381bb Reviewed-by: Martin Jones
| * Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-091-3/+37
| | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: If537d7c795dec46eedee62511e75bab862676ef1
| * Revert to previous lineHeight behavior.Martin Jones2011-03-091-4/+2
| | | | | | | | | | | | | | | | | | | | f47f01fd34d08f6152c9053c0d6928fc359aa0f9 changed the height of the Text to not include the extra spacing at the end of the block. This is different to what QDextDocument does. Revert back to the old behavior. Change-Id: Ie43dea4dd5a0e9ba179f44c246fb834322db11e3 Reviewed-by: Joona Petrell
| * Use the text layout bounds calculated by QLayout.Martin Jones2011-03-081-2/+4
| | | | | | | | | | | | | | | | | | We used to calculate the size and position of the cache image ourselves. Rather use the line positions and bounding rect calculated by QLayout. Change-Id: I601688ab7e310b0015a1994adf52b108f39504d8 Reviewed-by: Joona Petrell
| * Base empty QML editor horizontal alignment on ↵Joona Petrell2011-03-081-2/+4
| | | | | | | | | | | | | | | | | | QApplication::keyboardInputDirection() Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I240d53c8572fd3d1222b555e93812a3ee38e2558
| * Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-0/+29
| | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
| * Fix RTL multiline Text drawingMartin Jones2011-03-041-6/+6
| | | | | | | | | | | | | | | | | | | | We handled horizontal alignment ourselves, but this neglected some RTL layouting issues (e.g. trailing spaces). Allow QTextLayout to do the aligning for us. Also fix eliding of multiline text for RTL language - in this case the eliding should be to the left. Change-Id: I487137b123ae66c1f5fc358a8d8a013049d05818 Reviewed-by: Joona Petrell
| * Remove text alignment of empty QML editors following the layout directionJoona Petrell2011-03-041-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Removed implicit text alignment of empty text in QML editor following the application's default layout direction. Change was originally made few days ago in the commit 88253db8a7d7910e1393b1948fb3747117538c92. Aligning empty and neutral text to the right for RTL locales requires much more comprehensive changes to the Qt's internal text classes than initially thought. Change-Id: I93a26df259b87dff47d57423949270656746c9a7
| * Merge branch '4.7' into qtquick11Joona Petrell2011-03-042-0/+24
| |\
| * | Make sure horizontal QML editor text aligment always returns the actual ↵Joona Petrell2011-03-011-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alignment Also, implicit empty text alignment now follows the Application's default layout direction traditionally set by the locale. Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I88340513d489290bafd393072786a19731097b77
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-032-0/+24
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | Don't assert if font engine creates new glyphsAaron Kennedy2011-03-022-0/+24
| |/ | | | | | | | | Change-Id: Id18f58822f990788b511cbce02f8e4cf7d787c21 Task-number: QTBUG-14734
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from ↵Yann Bodson2011-02-091-6/+6
| | | | | | | | | | | | | | | | | | | | master. - MultiplyHeight becomes ProportionalHeight - PixelHeight becomes FixedHeight Change-Id: I2a1ebc6ff9db7e62f513919f19773f985b08f8d7 Reviewed-by: Michael Brasser
| * Disable lineHeight test while implementing the feature in master properly.Yann Bodson2011-02-071-3/+3
| |
* | Fixes XPASSOlivier Goffart2011-02-091-1/+0
| |
* | Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-091-0/+3
| | | | | | | | | | | | | | It was not properly merged in master because of conflicts, and we have now a public API for this Added QEXPECT_FAIL and opened QTBUG-17325
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-044-0/+235
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| * Add missing versioning tests for new QtQuick 1.1 properties/methods.Martin Jones2011-01-311-1/+23
| | | | | | | | | | Task-number: QTBUG-15489 Reviewed-by: Bea Lam
| * Fix lineHeight autotests.Yann Bodson2011-01-281-4/+4
| |
| * Add support for line spacing in Text element.Yann Bodson2011-01-282-0/+47
| | | | | | | | | | | | | | This change adds the lineHeight and lineHeightMode properties. Task-number: QTBUG-14296 Reviewed-by: Martin Jones
| * Fixing right-to-left text in Text and TextInputChristopher Ham2011-01-282-0/+51
| | | | | | | | | | | | | | | | | | The Text and TextInput items should now automatically flip the alignment of right-to-left text. Autotests also added to ensure the text is on the correct side (added for TextInput also). Task-number: QTBUG-15880 Reviewed-by: Martin Jones
| * Add missing revisions for QtQuick 1.1 additionsMartin Jones2011-01-272-1/+42
| | | | | | | | | | Task-number: QTBUG-15279 Reviewed-by: Michael Brasser
| * Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-0/+29
| | | | | | | | | | | | | | | | Overridden as readonly for elements that have an inherent implicit size such as Text, TextEdit, TextInput, positioners, Loader. Task-number: QTBUG-14957 Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\
| * | QDeclarativeText has new multiline propertiesChristopher Ham2011-01-142-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LineCount should return the number of lines currently being displayed. Setting maximumLineCount limits the number of lines that will be shown Truncated will return true if the text has been elided normally, or if the lines have been limited due to maximumLineCount. Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-234-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * | Fix CI by recreating reference bitmaps for text comparisonJoona Petrell2010-10-199-0/+0
| | |
| * | tst_qdeclarativetext: Regenerate the baselines after the merge.Olivier Goffart2010-10-159-0/+0
| | | | | | | | | | | | This need to be checked.
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-153-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 Petrell2010-10-133-0/+0
| | | | | | | | | | | | | | | | | | in Text painting Task-number: QTBUG-14374
| * | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-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
* | | Fix deployment for examples and testsShane Kearns2010-10-121-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-047-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 Kennedy2010-09-297-61/+61
| | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* | Fixed qdeclarativetext auto-test to work with raster graphicssystem.Samuel Rødal2010-09-203-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 elementMartin Jones2010-09-081-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 Jones2010-07-212-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 Jones2010-07-211-4/+4
| | | | | | | ... and percentage is useless. Task-number: QTBUG-12282 Reviewed-by: Warwick Allison
* Ensure the boundingRect() of Text is correctly calculated.Michael Brasser2010-07-201-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 elementJoona Petrell2010-07-021-3/+3
| | | | | Task-number: Reviewed-by: Martin Jones
generated by cgit v0.12 at 2025-01-25 06:52:43 (GMT)