summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Small calculator fix.Yann Bodson2010-04-152-10/+10
|
* Improve declarative calculator example.Yann Bodson2010-04-1513-227/+238
|
* Update examples autotest to use the runtime directlyAaron Kennedy2010-04-154-96/+42
| | | | This improves the test execution time
* Support valuetypes as method return valuesAaron Kennedy2010-04-159-41/+133
| | | | QTBUG-9818
* Compile without Qt3 support.Yann Bodson2010-04-151-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-151-0/+20
|\
| * DocAaron Kennedy2010-04-151-0/+20
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1518-104/+178
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1556-1467/+327
| |\
| * | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1517-99/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | This property complements Component.onCompleted. It is emitted before the destruction actually begins (for the most part) so the objects are still alive and accessible. The QtObject.onDestroyed signal is now blocked as it never really worked properly anyway.
| * | CommentsAaron Kennedy2010-04-151-1/+3
| | |
| * | Remove unused parameterAaron Kennedy2010-04-153-4/+4
| | |
* | | Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-153-13/+10
| | | | | | | | | | | | Task-number: QTBUG-9900 QT-3287
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1524-1436/+130
|\ \ \ | | |/ | |/|
| * | Visual test updates.Michael Brasser2010-04-1521-1422/+109
| | |
| * | Rename section so that it's not linked to by references to "JavaScript"Bea Lam2010-04-151-1/+1
| | |
| * | Doc improvementsBea Lam2010-04-152-13/+20
| | |
* | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-1511-44/+101
|/ / | | | | | | Task-number: QTBUG-9908
* | Correctly resolve, and load, IMG tags in Text element.Warwick Allison2010-04-1510-10/+176
| | | | | | | | | | | | Task-number: QTBUG-9900 Reviewed-by: Martin Jones
* | Rename "sql" test so autotester doesn't get confused.Warwick Allison2010-04-1520-20/+20
| |
* | Should work now, don't skip.Warwick Allison2010-04-151-1/+0
| |
* | ignore autotester logsWarwick Allison2010-04-151-0/+1
|/
* Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeDataAaron Kennedy2010-04-1521-80/+80
|
* Rename QDeclarativeData -> QAbstractDeclarativeDataAaron Kennedy2010-04-156-17/+17
| | | | Reviewed-by: Martin Jones
* Fix typoBea Lam2010-04-151-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-158-51/+319
|\
| * Improve integration docs and add examplesBea Lam2010-04-158-51/+319
| |
* | Add flow property to Grid, adding TopToBottom mode.Martin Jones2010-04-154-43/+185
|/ | | | Task-number: QTBUG-9183
* Add QML object destruction hookAaron Kennedy2010-04-152-2/+13
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-155-3/+36
|\
| * Make sure richtext wraps correctly with a fixed height set.Martin Jones2010-04-152-1/+21
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-151-2/+2
| |\
| | * Fix localFont path in fonts example.Yann Bodson2010-04-151-2/+2
| | |
| * | Output script errors in ScriptAction and StateChangeScriptMartin Jones2010-04-152-0/+13
| |/ | | | | | | Task-number: QTBUG-9897
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-14134-1266/+2184
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1410-70/+259
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-14315-2652/+4612
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (71 commits) Add QML documentation for validators Updates to the module documentation Fix minor typo in docs Revert "qdeclarativefocusscope works fine as a parallel test" qdeclarativefocusscope works fine as a parallel test Reduce warnings at shutdown Image with PreserveAspect enabled with either width or height defined should implicitly update the undefined axis to follow the aspect ratio Fix GridView.onRemove animation in photoviewer. Reduce warnings at shutdown Fix QT_NO_DESKTOPSERVICES Compiled bindings should not print warnings where normal bindings don't Update references links Move example code into separate files to make sure they compile Include qvariant.h as a convenience as context properties Merged 'orientation' into 'runtime' context property in qmlruntime Add 'runtime' property to the rootContext of DeclarativeViewer Temporarily disable tests that require compilation Fix qdeclarativedom test Further improve failure output Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystem ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-1410-70/+259
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF: fixed typo in trace statement Update to def files for 4.7.0-beta1 Fixed installer_sis target for 4.7
| | | * | Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This builds under RVCT 2.2 (although obviously the debug output will contain garbage), but causes a compiler error with RVCT 4. Reviewed-by: trustme
| | | * | Update to def files for 4.7.0-beta1Shane Kearns2010-04-148-65/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frozen against qt-releases/4.7.0-beta1 commit 4061d0ff3e8ed72ecb83ef1026492511a0afb9fa Task-number: QTBUG-9892 Reviewed-by: Trust Me
| | | * | Fixed installer_sis target for 4.7Miikka Heikkinen2010-04-141-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to pkg file generation refactoring in 4.7, these fixes hadn't been ported from 4.6 to 4.7 previously. Task-number: QTBUG-9864 Reviewed-by: Janne Koskinen
| * | | | Don't create delegates when destroying view.Martin Jones2010-04-141-1/+4
| | |_|/ | |/| | | | | | | | | | Task-number: QTBUG-9840
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-144-6/+19
| |\ \ \
| | * | | Updates to the module documentationmae2010-04-143-4/+17
| | | | |
| * | | | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Note that regExp doesn't have a type, and so it is 'documented' as string. Task-number: QTBUG-9412
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-14118-1181/+1833
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1493-1090/+1616
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits) Revert "Removed double setting of _WIN32_WINNT" Revert "removed a few warnings on wince builds" removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER ...
| | | * | Revert "Removed double setting of _WIN32_WINNT"Olivier Goffart2010-04-133-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a165d1cfbb15ced6079a0d752fbdb37a478ff46f. Was causing an error: (msvc2005) qthread_win.cpp(369) : error C3861: 'SwitchToThread': identifier not found
| | | * | Revert "removed a few warnings on wince builds"Paul Olav Tvete2010-04-132-5/+5
| | | | | | | | | | | | | | | | | | | | This reverts commit 6b2cf497268037a5c127affeef3e6efd055164ec.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1397-1119/+1628
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits) removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix ...