Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt/master' into file-engine-refactor | João Abecasis | 2010-11-23 | 2 | -1/+26 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-15 | 1 | -0/+25 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Bug: TextEdit ignores plain text format when pasting text | Yann Bodson | 2010-10-12 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | Task-number: QTBUG-14003 Reviewed-by: Michael Brasser | ||||
| * | | 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 | ||||
* | | Fix deployment for examples and tests | Shane Kearns | 2010-10-12 | 1 | -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 | ||||
* | Replace all occurances of "Qt 4.7" with "QtQuick 1.0" | Aaron Kennedy | 2010-09-29 | 18 | -49/+49 |
| | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones | ||||
* | Simplify type management code | Aaron Kennedy | 2010-08-27 | 1 | -1/+1 |
| | |||||
* | Make QML tests compile on OpenSolaris | Martin Jones | 2010-08-19 | 1 | -1/+1 |
| | | | | Task-number: QTBUG-13003 | ||||
* | Fix TextEdit text attribute and text stored in the internal QTextDocument ↵ | Joona Petrell | 2010-07-22 | 1 | -0/+34 |
| | | | | | | | having different contents Task-number: QTBUG-12339 Reviewed-by: Martin Jones | ||||
* | QML focus API updates. | Michael Brasser | 2010-07-21 | 1 | -14/+14 |
| | | | | | | | | | The wantsFocus property has been renamed to activeFocus, to better reflect its value. Reading and writing the focus property is also now consistent -- this property represents focus within a scope. Other small changes were made to keep things consistent with the new naming. Reviewed-by: Aaron Kennedy | ||||
* | Fix Mac CI | Joona Petrell | 2010-07-12 | 1 | -0/+12 |
| | |||||
* | Add copy(), cut() and paste() support to TextInput | Joona Petrell | 2010-07-12 | 1 | -0/+35 |
| | | | | | Task-number: QTBUG-12086 Reviewed-by: Michael Brasser | ||||
* | Make Text, TextInput, and TextEdit all have the same size for the same text. | Warwick Allison | 2010-07-07 | 1 | -3/+3 |
| | | | | | | | | | | | | This may mean that the cursor is to the right of the width, so components should cater for that with a margin if they are boxed / clipped. TextInput used to try to account for right bearing (and left bearing incorrectly since it added it on the right). This is removed. Potentially this means that for some fonts the text repaints incorrectly on the left or right, but if that is the case Text and TextEdit already had such a problem (undetected), and all will need fixing. Task-number: QTBUG-11983 | ||||
* | More generated images in anticipation of QT-3574 | Warwick Allison | 2010-07-07 | 1 | -10/+18 |
| | |||||
* | Fix TextEdit with no color property defined is drawn with wrong color | Joona Petrell | 2010-07-06 | 1 | -0/+18 |
| | | | | | Task-number: QTBUG-11932 Reviewed-by: Martin Jones | ||||
* | Prepare for QTest persistent store for visual tests. | Warwick Allison | 2010-07-05 | 1 | -22/+22 |
| | |||||
* | Fix TextEdit bitmap tests testing the wrong element | Joona Petrell | 2010-07-02 | 1 | -1/+1 |
| | | | | | 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/+96 |
| | | | | | | Various clipping and refresh bugs. Task-number: QTBUG-11492 | ||||
* | Make declarative autotests compile on Symbian abld build system | Joona Petrell | 2010-06-08 | 2 | -3/+6 |
| | | | | | Task-number: Reviewed-by: Martin Jones | ||||
* | Remove unnecessary CloseSoftwareInputPanel events after TextEdit or ↵ | Joona Petrell | 2010-06-07 | 1 | -26/+47 |
| | | | | | | | TextInput has lost focus Task-number: Reviewed-by: Warwick Allison | ||||
* | Fix regression in input panel autotests | Joona Petrell | 2010-06-07 | 1 | -1/+6 |
| | |||||
* | Improve input panel handling in declarative demos and examples | Joona Petrell | 2010-06-03 | 1 | -6/+0 |
| | | | | | Task-number: QTBUG-11157 Reviewed-by: Warwick Allison | ||||
* | Take into account platform differences in input panel support | Joona Petrell | 2010-06-02 | 1 | -15/+68 |
| | | | | | Task-number: Reviewed-by: Warwick Allison | ||||
* | Simplify selection setting. Make TextInput more like TextEdit. | Warwick Allison | 2010-05-31 | 1 | -28/+11 |
| | | | | | | By making selectionStart/End read-only, and adding adding select(). Task-number: QTBUG-11056 | ||||
* | Active window focus gain should not open virtual keypad | Joona Petrell | 2010-05-28 | 1 | -2/+11 |
| | | | | | Task-number: Reviewed-by: Martin Jones | ||||
* | Open input panel on press if TextInput or TextEdit are already focused but ↵ | Joona Petrell | 2010-05-26 | 1 | -0/+9 |
| | | | | | | | panel has been closed Task-number: Reviewed-by: Martin Jones | ||||
* | Add a way to control when software input panels are shown in TextInput and ↵ | Joona Petrell | 2010-05-26 | 1 | -15/+70 |
| | | | | | | | TextEdit elements Task-number: QTBUG-10841 Reviewed-by: Warwick Allison | ||||
* | Fix | Warwick Allison | 2010-05-25 | 1 | -4/+4 |
| | |||||
* | Fix test. Missed files. | Warwick Allison | 2010-05-20 | 3 | -0/+21 |
| | |||||
* | Disable mouse-based selection in TextInput/TextEdit | Warwick Allison | 2010-05-19 | 1 | -0/+45 |
| | | | | | | | | Can still be turned back on, if people only want to target platforms where the behaviour is acceptable. Task-number: QTBUG-10684 Reviewed-by: Michael Brasser | ||||
* | 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 TextEdit and TextInput input panel support for mode ↵ | Joona Petrell | 2010-05-13 | 1 | -3/+8 |
| | | | | | | | RSIP_OnMouseClickAndAlreadyFocused Task-number: Reviewed-by: Warwick Allison | ||||
* | Round ideal width up to prevent incorrect word wrapping on Mac OS X | Aaron Kennedy | 2010-05-11 | 1 | -2/+2 |
| | | | | QTBUG-10539 | ||||
* | Call QDeclarativeItem::geometryChanged() base implementation | Aaron Kennedy | 2010-05-06 | 2 | -1/+24 |
| | |||||
* | Fix versioning of Qt Declarative's in-built types | Alan Alpert | 2010-04-21 | 12 | -12/+12 |
| | | | | | | 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 | -1/+1 |
| | | | | QTBUG-9726 | ||||
* | Rename remaining import Qt 4.6 lines to import Qt 4.7 | Joona Petrell | 2010-04-14 | 1 | -30/+30 |
| | | | | | Task-number: Reviewed-by: Martin Jones | ||||
* | Fix and test remote root component with qmldir-specified content. | Warwick Allison | 2010-04-13 | 2 | -22/+41 |
| | | | | 6ed43975f6733265b8b91b00a9a212076d896ef9 was not correct fix (just invalidated the test) | ||||
* | TextEdit::wrap changed to TextEdit::wrapMode enumeration | Martin Jones | 2010-04-09 | 1 | -3/+3 |
| | |||||
* | Replace "property var " with "property variant " in QML code | Aaron Kennedy | 2010-04-09 | 2 | -2/+2 |
| | |||||
* | Fix qdeclarativetextedit::delegateLoading autotest | Leonardo Sobral Cunha | 2010-03-22 | 2 | -0/+5 |
| | | | | After d039e2e8307, this test broke because of restricted remote imports. | ||||
* | Clairify a comment in one of the auto tests. | Alan Alpert | 2010-03-03 | 1 | -2/+2 |
| | |||||
* | Ensure error is received - the root object is INITIALLY zero. | Warwick Allison | 2010-03-03 | 1 | -0/+2 |
| | |||||
* | Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX ↵ | Leonardo Sobral Cunha | 2010-02-24 | 1 | -24/+24 |
| | | | | to QDeclarativeXXX. | ||||
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵ | Warwick Allison | 2010-02-24 | 14 | -0/+948 |
QDeclarativeXXX. |