summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | QUrl::setUrl should call detachOlivier Goffart2011-01-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16425 Reviewed-by: Gabriel Reviewed-by: Markus Goetz
| | * | | qkeymapper_x11.cpp: fix compilation with LSB and without XKBOlivier Goffart2011-01-061-8/+7
| | |/ / | | | | | | | | | | | | | | | | Task-number: QTBUG-16312 Reviewed-by: Marius Storm-Olsen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-065-2/+83
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView crashed when the path is provided with undefined values. PathView: update modelCount before attempting to regenerate delegates.
| | * | PathView crashed when the path is provided with undefined values.Martin Jones2011-01-063-1/+38
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16356 Reviewed-by: Bea Lam
| | * | PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-063-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the model is a VisualDataModel, the count will initally be zero and modelCount is not updated due to itemsInserted() before the component is completed. Task-number: QTBUG-16357 Reviewed-by: Bea Lam
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-063-116/+138
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update docs - calling overloaded functions from QML is now supported Doc fixes for introduction page and Item docs
| | * | Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| | | |
| | * | Doc fixes for introduction page and Item docsBea Lam2011-01-062-111/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved 'Identity' and 'Property Change Signals' sections from Item docs to the intro page, which previously had a section on ids but this has been moved out of the 'Properties' section since an id isn't an ordinary property.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-0510-130/+1779
| |\ \ \ | | |/ / | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix outdated tests
| | * | Fix outdated testsAlan Alpert2011-01-0510-130/+1779
| |/ / | | | | | | | | | | | | | | | | | | selftest_noimages and qdeclarativespringanimation were correct, updating test scripts to match. Task-number: QTBUG-14792
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-043-1/+51
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix def file names for libinfixed testlib Generate freeze targets in Symbian
| | * | Fix def file names for libinfixed testlibMiikka Heikkinen2011-01-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Janne Koskinen
| | * | Generate freeze targets in SymbianMiikka Heikkinen2011-01-042-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to freeze def files via makefile targets. Task-number: QTBUG-13769 Reviewed-by: Janne Koskinen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-049-11/+81
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMeeGoGraphicsSystemHelper::setSwapBehavior implementation. Support for swap modes in QGLWindowSurface. Pre-create the GL share widget before window surface creation. QMeeGoSwitchEvent exported and static. Fixed first element being a LineToElement in QPainterPath::connectPath()
| | * | | QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.Michael Dominic K2011-01-043-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 993 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-042-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AlwaysFull and AlwaysPartial implemented in ES only for now. By default do automatic. Merge-request: 993 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not pixmap creation. Merge-request: 988 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>