summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile on windowsAlan Alpert2011-01-181-6/+8
|
* Avoid index out of bounds array accessesAlan Alpert2011-01-181-2/+5
|
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Alan Alpert2011-01-1813-36/+46
|\
| * Fix declarative autotest compilation on SymbianJoona Petrell2011-01-185-12/+27
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * Fix QtDeclarative compilation warningsJoona Petrell2011-01-185-23/+8
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * Add a way to clear warnings in qmlviewer warnings window on SymbianJoona Petrell2011-01-182-1/+8
| | | | | | | | | | | | | | Basically by adding a clear soft key to the currently empty right soft key in warninng window in qmlviewer. Task-number: Reviewed-by: Martin Jones
| * Cleanup view at end of auto test.Martin Jones2011-01-181-0/+3
| |
* | Implement layoutDirection property on Row, Grid, FlowAlan Alpert2011-01-1812-31/+705
| | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Joona Petrell
* | Document TextInput::readOnlyAlan Alpert2011-01-181-0/+10
| |
* | Proper versioning for canPasteAlan Alpert2011-01-182-2/+2
|/
* Fix memory leakAaron Kennedy2011-01-171-3/+9
| | | | Introduced by 488e616b50707e5b37162e6d0cfc71a1ffdf9bef
* Add canPaste property to TextInput and TextEditAlan Alpert2011-01-178-3/+83
| | | | | Task-number: QTBUG-16190 Reviewed-by: Martin Jones
* Add a warning when translating QML application in qmlviewer failsJoona Petrell2011-01-171-2/+5
| | | | | Task-number: Reviewed-by: Martin Jones
* Remove unnecessary debug traces from declarative classesJoona Petrell2011-01-172-2/+0
| | | | | Task-number: Reviewed-by: Martin Jones
* Add lineCount property to QDeclarativeTextEditChristopher Ham2011-01-144-1/+40
| | | | | | | | The lineCount property should return the number of lines contained in textEdit. Also corrected minor documentation in Text Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
* QDeclarativeText has new multiline propertiesChristopher Ham2011-01-145-15/+230
| | | | | | | | | | 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
* Add NOTIFY signals to Flipable 'front' and 'back' propertiesBea Lam2011-01-132-2/+6
| | | | | | | | | Although the change notifications themselves may not be that useful, as these properties are write-once, adding the NOTIFY signals allows the properties to be used in bindings. Task-number: QTBUG-16580, QTBUG-14551 Reviewed-by: Martin Jones
* Revert "Don't use implicitSize when calculating implicit size"Alan Alpert2011-01-121-6/+4
| | | | | This reverts commit d91eb7728beea99eb347293c89500cfa03814208. Need to consult on the expected behavior before fixing this one.
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Alan Alpert2011-01-122-0/+5
|\
| * QDeclarativeDebug: Hardcode version when serializing Qt typesKai Koehne2011-01-111-0/+1
| | | | | | | | | | | | | | Make sure that e.g. QtCreator compiled with 4.7 can debug a program compiled with 4.8. Reviewed-by: Christiaan Janssen
| * QDeclarativeDebug: Extend autotestKai Koehne2011-01-111-0/+4
| | | | | | | | Check that sendMessage doesn't crash if service isn't connected.
* | Don't use implicitSize when calculating implicit sizeAlan Alpert2011-01-121-4/+6
|/ | | | | | | | Width/height ended up getting trapped at <0 in this fillMode if only one of witdh/height was explicit. Task-number: QTBUG-16389 Reviewed-by: Michael Brasser
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Alan Alpert2011-01-1120-230/+767
|\
| * Add methods to position view at beginning or end.Martin Jones2011-01-119-108/+355
| | | | | | | | | | | | | | Takes into account header/footer. Task-number: QTBUG-16213 Reviewed-by: Michael Brasser
| * Fix Qt.formatTime() to accept QTime valuesBea Lam2011-01-114-75/+173
| | | | | | | | | | | | | | QScriptValue::toDateTime() does not work for QTime values. Task-number: QTBUG-16492 Reviewed-by: Michael Brasser
| * set() and setProperty() should not always trigger change signalsBea Lam2011-01-116-46/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix set() and setProperty() to only trigger itemsChanged(), and the the <property>Changed signals for items returned by get(), if the new value is different from the old one. The exception to this are list values, as it is inefficient to check the sublists and also the model classes are due to be revised. This also fixes models used with a WorkerScript to emit itemsChanged() with the correct roles. Task-number: QTBUG-14620 Reviewed-by: Michael Brasser
| * Fix examples autotest failureJoona Petrell2011-01-111-1/+1
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | Don't crash if cursor at the end.Alan Alpert2011-01-111-1/+4
|/ | | | | | | | 77cba04c2 assumed a level of bounds checking in QTextLayout that does not exist. Task-number: qtbug-15818 Reviewed-by: Michael Brasser
* Add versioning for new Flickable methods.Martin Jones2011-01-113-3/+46
| | | | Task-number: QTBUG-15148
* Disable dragging text in TextEdit.Andrew den Exter2011-01-117-1/+120
| | | | | | | | Add a dragEnabled property to QTextControl so text dragging can optionally be disabled. Task-number: QTBUG-16248 Reviewed-by: Martin Jones
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Alan Alpert2011-01-105-4/+24
|\
| * Add property versioning checks for QtQuick 1.1 deselect() functionJoona Petrell2011-01-103-3/+6
| | | | | | | | | | Task-number: QTBUG-16059 Reviewed-by: Martin Jones
| * Add no warnings label to qmlviewer warnings windowJoona Petrell2011-01-102-1/+18
| | | | | | | | | | | | | | Small developer usability improvement Task-number: Reviewed-by: Bea Lam
* | Fix word selection in QLineControlAlan Alpert2011-01-109-2/+1054
|/ | | | | | | | | | Word selection occasionally selected the word beforehand as well, in both QLineEdit and TextInput. Visual Test included to verify behavior. Task-number: QTBUG-15818 Reviewed-by: Martin Jones
* Add selection modes to TextEdit and TextInput.Andrew den Exter2011-01-106-19/+512
| | | | | | | | | Add an overload for moveCursorSelection which takes a parameter specifying whether to update the selection with individual characters or whole words. Task-number: QTBUG-16283 Reviewed-by: Martin Jones
* Document property/method versioning in QML.Martin Jones2011-01-102-0/+84
| | | | | Task-number: QTBUG-13451 Reviewed-by: Bea Lam
* Add missing Qt namespaces macros to qdeclarativeapplication.cpp source fileJoona Petrell2011-01-071-0/+4
| | | | | Task-number: Reviewed-by: Aaron Kennedy
* Add layoutDirection property to Qt.application elementJoona Petrell2011-01-073-2/+56
| | | | | Task-number: QTBUG-16424 Reviewed-by: Martin Jones
* Introduce Qt.application.active propertyJoona Petrell2011-01-0710-1/+366
| | | | | | | Replaces qmlviewer's runtime.activeWindow property. Task-number: QTBUG-13351 Reviewed-by: Martin Jones
* Group all QtQuick 1.1 registrations togetherMartin Jones2011-01-071-8/+7
| | | | Task-number: QTBUG-15279
* PinchArea API changes following review.Martin Jones2011-01-074-35/+35
| | | | | Task-number: QTBUG-15491 Reviewed-by: Michael Brasser
* Add PinchArea autotests.Martin Jones2011-01-072-2/+3
| | | | Task-number: QTBUG-15491
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-0710-3/+412
|\
| * Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Alan Alpert2011-01-072-0/+50
| |\
| * | Add linkActivated signal to TextEditAlan Alpert2011-01-0710-3/+412
| | | | | | | | | | | | | | | | | | | | | | | | Since TextEdit can also contain rich text with anchors, it should also have a linkActivated signal like Text does. Task-number: QTBUG-15283 Reviewed-by: Martin Jones
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-07184-5429/+8889
|\ \ \ | |_|/ |/| | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-061-2/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
| | * | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The access point scanner cancels itself in the destructor. This requires the handle to be valid, but it was closed in the symbian engine destructor immediately before deleting the AP scanner. Because of the way symbian active objects work, the crashing function is only called if there was an asynchronous request in progress. So it could be missed in cases where the scan completes faster than the test case. Task-number: QTBUG-16484 Reviewed-by: Markus Goetz
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-064-8/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB
| | * | | Designer: Block QEvent::WinIdChange.Friedemann Kleint2011-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it causes an obscure deletion crash related to the formeditor rubberband on Mac. Reviewed-by: con