summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-217-16/+140
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes. Add my 4.6.3 changes Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3 Switch Symbian^3 QCursor implementation back to 5.0 way fix qmake -project once more
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-217-16/+140
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-201-9/+81
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes.
| | | * My 4.6.3 changes.Trond Kjernåsen2010-05-201-16/+73
| | | |
| | | * Added my 4.6.3 changes.Kim Motoyoshi Kalland2010-05-201-1/+4
| | | |
| | | * My 4.6.3 changes.Samuel Rødal2010-05-201-0/+12
| | | |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-201-2/+19
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add my 4.6.3 changes
| | | * Add my 4.6.3 changesKent Hansen2010-05-201-2/+19
| | |/
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-203-9/+43
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3
| | | * Fix WebKit version dependency in pkg filesSimon Hausmann2010-05-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the Qt major/minor/patch version for WebKit, but use them only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is read by qt.prf Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | | * Add support for including module specific .pri files as part of qt.prf handlingSimon Hausmann2010-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | | * My changelog entries for 4.6.3Denis Dzyubenko2010-05-201-2/+9
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * Add my changes to the 4.6.3 changes logEskil Abrahamsen Blomfeldt2010-05-201-2/+14
| | | |
| | | * my changelog for 4.6.3Peter Hartmann2010-05-201-4/+9
| | | |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-201-2/+0
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Switch Symbian^3 QCursor implementation back to 5.0 way
| | | * Switch Symbian^3 QCursor implementation back to 5.0 wayShane Kearns2010-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The window server bug with pointer cursors may not have been fixed, in any case enabling pointer cursors on Symbian^3 requires WriteSystemData capability which isn't available to all applications. This change fixes the "qt_s60_setWindowGroupCursor - null handle" warnings when using the touch screen. Tested with QCursor manual test (tst_allcursors) Reviewed-by: Sami Merila
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-193-0/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix qmake -project once more
| | | * | fix qmake -project once moreOswald Buddenhagen2010-05-183-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default_pre.prf adds "uic" and "resources" to CONFIG, but not "qt". as a consequence, the former do not find qtPrepareTool(), as nobody includes qt_functions.prf if no qmake spec is loaded. Reviewed-by: joerg
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2011-1/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make dynamicscene example embeddeable in another graphics scene Some minor example fixes
| * | | | | Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
| | | | | |
| * | | | | Some minor example fixesAlan Alpert2010-05-2010-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -dial moved to dial-example so the dirname is the same as the qml name -added rssnews to .pro so it can be installed -added some README files like the other dirs
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2013-13/+64
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update docs with correct property name Fix incorrect merge Work around rendering bug in Rectangle. Remove warnings. Test e75088323ae15604139ddfd66b85cc3b8d43abeb Add XmlListModel::errorString() Fix dynamicscene example Update old keyword in docs
| * | | | | Update docs with correct property nameAlan Alpert2010-05-201-1/+1
| | | | | |
| * | | | | Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Didn't actually notice the name change of that function
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-20210-3892/+4443
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/toys/dynamicscene/qml/itemCreation.js
| | * | | | | Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10765
| | * | | | | Remove warnings.Warwick Allison2010-05-202-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10816
| | * | | | | Test e75088323ae15604139ddfd66b85cc3b8d43abebWarwick Allison2010-05-202-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10820
| | * | | | | Add XmlListModel::errorString()Bea Lam2010-05-203-2/+37
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
| |\ \ \ \ \ \
| * | | | | | | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all the renaming (presumably) the moon broke, now fixed. Also made it slightly smaller, to be friendlier to desktop systems with small screens (and the fixed size qtdemo)
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-19590-58544/+17061
| |\ \ \ \ \ \ \
| * | | | | | | | Update old keyword in docsAlan Alpert2010-05-191-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-20179-992/+3327
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits) Be consistent in conversion from string (eg. color, int rounding). Simplify code to make next change clearer. Stop warnings. Improve error messages when tests fail. Stop highlight animators for highlightFollowsCurrentItem: false Ensure valuetype enums can be assigned from JS Improve testcase Rename Component::errorsString() -> errorString() (and also for Fixes for docs, example code Make test more stable Autotest (XFAIL) for QTBUG-10822 Add return value for resolveTypeInNamespace Fix test Fix test. Missed files. Missing break Create overview page for examples for Extending QML in C++ Search for QML import libraries also in application directory Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer ...
| * | | | | | | | Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10820 Reviewed-by: Michael Brasser
| * | | | | | | | Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| | | | | | | | |
| * | | | | | | | Stop warnings.Warwick Allison2010-05-202-11/+11
| | | | | | | | |
| * | | | | | | | Improve error messages when tests fail.Warwick Allison2010-05-201-14/+15
| | | | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-206-8/+178
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-206-8/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10803
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-2021-93/+192
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-2012-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeComponent)
| | * | | | | | | | Fixes for docs, example codeBea Lam2010-05-209-71/+168
| | | | | | | | | |
| * | | | | | | | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-202-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10830
| * | | | | | | | | Improve testcaseAaron Kennedy2010-05-202-1/+11
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the default was AllUppercase, the tests weren't actually testing anything other than that assigning enums had no errors
| * | | | | | | | Make test more stableAaron Kennedy2010-05-201-2/+3
| | | | | | | | |
| * | | | | | | | Autotest (XFAIL) for QTBUG-10822Aaron Kennedy2010-05-202-0/+22
| | | | | | | | |
| * | | | | | | | Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
| | | | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-203-0/+21
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-201-0/+1
| | |\ \ \ \ \ \ \ \
generated by cgit v0.12 at 2025-03-21 09:42:00 (GMT)