summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding support for group properties in Component::CreateObject()Christopher Ham2011-01-283-2/+8
| | | | | | | | | The QScriptValue overload for Component::CreateObject() should be able to set group properties. This change also allows for property binding from Javascript to continue to function. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-281-1/+1
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
| * Update test, versioning is fixed so expect-fail no longer neededBea Lam2011-01-281-1/+0
| |
| * photoviewer needs QtQuick 1.1 for Image::cacheBea Lam2011-01-281-1/+1
| |
* | Test failure fixed - remove XFAILMartin Jones2011-01-281-2/+0
|/
* disable some pincharea tests on mac temporarilyBea Lam2011-01-281-0/+9
|
* Fix failing test on mac for Qt.applicationBea Lam2011-01-281-0/+4
| | | | setActiveWindow(0) on mac does not deactivate the current application.
* Fix test breakage for qdeclarativeworkerscriptBea Lam2011-01-281-1/+3
| | | | Broken by 43b8305367156c1ceb09eb4a056bdae3f325b5eb.
* Doc fix for lineHeight.Yann Bodson2011-01-281-1/+3
|
* Add support for line spacing in Text element.Yann Bodson2011-01-287-6/+162
| | | | | | | 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-2810-12/+183
| | | | | | | | | 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
* Fix MaximumLineCount in Text and add testsChristopher Ham2011-01-2826-24/+201
| | | | | | | | | Fixed MaximumLineCount not truncating when wrapMode was not set. Visual autotests were added to test various possible options for maximumLineCount. Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
* Ensure simple objects also get the appropriate property cacheAaron Kennedy2011-01-285-11/+32
| | | | Task-number: QTBUG-13849
* Add test for Loader implicitWidth/implicitHeightMartin Jones2011-01-282-0/+46
|
* Don't crash when appending a null itemAaron Kennedy2011-01-273-5/+21
| | | | Task-number: QTBUG-16871
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-274-5/+41
|\
| * Test for passing functions to createObject() for property bindingsBea Lam2011-01-272-2/+38
| |
| * Fix object check in createObjectChristopher Ham2011-01-271-2/+2
| | | | | | | | | | | | | | | | The 'if' check for the value map was inverted. Spelling in warning was fixed. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| * Apply property bindings during component creation. Add versioningChristopher Ham2011-01-271-1/+1
| | | | | | | | | | | | | | | | | | Versioning for QtQuick 1.1 was added for invokable method in component. Full changes are in: aa40f956bab22678b62f630af97f51f9e8fab9f8 Task-number: QTBUG-13087 Reviewed-by: Bea Lam
* | Add missing revisions for QtQuick 1.1 additionsMartin Jones2011-01-2710-17/+148
| | | | | | | | | | Task-number: QTBUG-15279 Reviewed-by: Michael Brasser
* | Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-2788-4572/+5830
|\ \ | |/
| * Fix righ-to-left support in text components.Christopher Ham2011-01-275-13/+106
| | | | | | | | | | | | | | | | | | In text, textEdit and textInput, the layout of the text should automatically align to the right if the it is deemed to be right-to-left text. Task-number: QTBUG-15880 Reviewed-by: Bea Lam
| * Don't load components until the Loader component itself is completedBea Lam2011-01-273-66/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously components were loaded as soon as setSource() or setSourceComponent() were called, even if the Loader component was not complete. If a source component had been set, the itemChanged(), statusChanged() etc. signals would be emitted before the Loader would be complete and before the internal item had been sized. If a source had been set via url, these signals were not emitted at all. It also caused loaded() to be emitted twice for components set by setSourceComponent(). Task-number: QTBUG-16319 Reviewed-by: Martin Jones
| * Allow property bindings to be easily created from JavaScriptBea Lam2011-01-2714-83/+375
| | | | | | | | | | | | | | | | Properties can now be assigned a function that returns the binding value. Task-number: QTBUG-14964 Reviewed-by: Aaron Kennedy
| * Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-2731-178/+494
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-2770-4559/+5412
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/graphicsitems/qdeclarativelistview.cpp
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-268-15/+54
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix: define hotSpot for Gestures on Mac Fix warnings in PSQL driver: handle VersionUnknown in switch Fix warning in ODBC driver: passing NULL to non-pointer. QNAM FTP: switch to binary mode before sending a SIZE command Change the D-Bus signal filter to return NOT_YET_HANDLED for signals Check if the interpolators have already been deleted. Improve timer ID safety by using a serial counter per ID.
| | | * | Fix: define hotSpot for Gestures on MacZeno Albisser2011-01-262-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no hotSpot defined for a gesture it cannot be propagated propperly within GraphicsView. Task-number: QTBUG-16618 Reviewed-by: Denis Dzyubenko
| | | * | Fix warnings in PSQL driver: handle VersionUnknown in switchThiago Macieira2011-01-261-0/+6
| | | | |
| | | * | Fix warning in ODBC driver: passing NULL to non-pointer.Thiago Macieira2011-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Warning was: passing NULL to non-pointer argument 7 of 'SQLRETURN SQLGetDiagRecW(SQLSMALLINT, void*, SQLSMALLINT, SQLWCHAR*, SQLINTEGER*, SQLWCHAR*, SQLSMALLINT, SQLSMALLINT*)'
| | | * | QNAM FTP: switch to binary mode before sending a SIZE commandThiago Macieira2011-01-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With some servers, SIZE is not allowed in ASCII mode or it may return different sizes. Since we transfer in binary anyway, better get the size in binary too. Reviewed-by: Peter Hartmann
| | | * | Change the D-Bus signal filter to return NOT_YET_HANDLED for signalsThiago Macieira2011-01-261-2/+3
| | | | |
| | | * | Check if the interpolators have already been deleted.Thiago Macieira2011-01-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During application destruction, the order in which static destructors is run is undetermined. So avoid a null-pointer dereference. Task-number: QTBUG-16855 Reviewed-by: Robin Burchell Patch by task reporter
| | | * | Improve timer ID safety by using a serial counter per ID.Thiago Macieira2011-01-261-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The high bits of the counter are not used, so we store a serial counter there. This has nothing to do with the serial counter used in nextFreeTimerId, which is there for ABA protection. Reviewed-by: Bradley T. Hughes
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-261-4/+12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: QComboBox popup incorrectly opened in Sym^3
| | | * | | QComboBox popup incorrectly opened in Sym^3Sami Merila2011-01-261-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCombobox popup opens into incorrect position in Sym^3. This is due to that there is a new layout in use, where softkeys are positioned at the bottom. The current implementation just checks if native stacon component is in use and if not, puts the popup to left/right border of the application area (depending on UI direction). Task-number: QTBUG-16886 Reviewed-by: Miikka Heikkinen
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-263-0/+3
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add util/xkbdatagen/README
| | | * | | Add util/xkbdatagen/READMEOlivier Goffart2011-01-263-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-261-4/+4
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Application background is incorrect if app locked to landscape.
| | | * | Application background is incorrect if app locked to landscape.Sami Merila2011-01-261-4/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If application orientation has been locked to landscape and application is started out while device orientation is portrait, QS60Style draws the QPalette::background like device would be in landscape. Style is incorrectly following device orientation, when it should follow application orientation. As a fix, style follows now application orientation. As a bonus, unnecessary fullscreen QPixmap creation is avoided when rotating the device. Task-number: QTBUG-16816 Reviewed-by: Jani Hautakangas
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-2611-70/+383
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" add autotest for digest authentication QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-2511-70/+383
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" add autotest for digest authentication QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
| | | * | QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-258-40/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from http://trac.webkit.org/changeset/56370 The old allocator caused QML to crash in MCL (TB10.1, week 1). Task-number: QTBUG-14293 Reviewed-by: Simon Hausmann
| | | * | Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"Kent Hansen2011-01-259-309/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7db489a0de073a2a56fe32d16f1cbe1bebdfd06d. The change to CollectorHeapIterator.h is not Symbian-specific and it introduced test failures on all platforms (tst_QScriptEngineAgent::positionChange_3()).
| | | * | add autotest for digest authenticationPeter Hartmann2011-01-251-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-15070
| | | * | QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-259-44/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from http://trac.webkit.org/changeset/56370 The old allocator caused QML to crash in MCL (TB10.1, week 1). Task-number: QTBUG-14293 Reviewed-by: Simon Hausmann
| | | * | Improved performance of mapFromGlobal/mapToGlobal on X11Denis Dzyubenko2011-01-251-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't call XTranslateCoordinates anymore, but use the toplevel window offset that we already store to convert between screen coordinates and widget coordinates. Reviewed-by: João Abecasis
| | | * | Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivateDenis Dzyubenko2011-01-252-20/+32
| | | | | | | | | | | | | | | | | | | | Reviewed-by: João Abecasis
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-252-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Temporary fix for ambiguous cast from four letter char constant Fix QMAKE_POST_LINK in Symbian for targets with special characters.
| | | * | | Temporary fix for ambiguous cast from four letter char constantEckhart Koppen2011-01-251-2/+2
| | | | | |
generated by cgit v0.12 at 2025-01-28 17:52:14 (GMT)