summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix BorderImage tests on Windows.Martin Jones2010-02-111-9/+9
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-102596-40/+318839
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits) Expect fail. Expect fails. Attempt to clairify highlight range docs Make sure item release isn't deferred indefinately Expect fail. Missing file Exclude plugins example in test. Test Crash Fix tests Compile. Remove pathview test. Remove unneeded Fix repeater test. Revert "Remove unimplemented methods from header" Revert "Replace QList<>* support with QmlListProperty" Revert "Compile" Add expected fail and created QTBUG-8072 for qml animation auto-test Fix expected error message. Consolidate the two pathview tests and fix them all. ...
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-106-9/+50
| |\
| | * Expect fail.Martin Jones2010-02-101-0/+4
| | |
| | * Expect fails.Martin Jones2010-02-101-0/+3
| | |
| | * Make sure item release isn't deferred indefinatelyMartin Jones2010-02-102-9/+16
| | |
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-101-0/+25
| | |\
| | | * Missing fileAaron Kennedy2010-02-101-0/+25
| | | |
| | * | Expect fail.Martin Jones2010-02-101-0/+2
| | |/
| * | Attempt to clairify highlight range docsAlan Alpert2010-02-101-0/+10
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-104-1/+23
| |\
| | * TestAaron Kennedy2010-02-101-0/+17
| | |
| | * CrashAaron Kennedy2010-02-101-0/+2
| | |
| | * Fix testsBea Lam2010-02-102-1/+4
| | |
| * | Exclude plugins example in test.Martin Jones2010-02-101-0/+1
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-102-0/+5
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-107-321/+96
| | |\
| | | * Add expected fail and created QTBUG-8072 for qml animation auto-testLeonardo Sobral Cunha2010-02-101-0/+1
| | | |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-0974-1703/+2707
| | |\ \
| | * | | Reproduce bug.Warwick Allison2010-02-091-0/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6203
| * | | | Compile.Martin Jones2010-02-101-1/+1
| | | | |
| * | | | Remove pathview test.Martin Jones2010-02-101-1/+0
| | | | |
| * | | | Remove unneededMartin Jones2010-02-101-8/+0
| | | | |
| * | | | Fix repeater test.Martin Jones2010-02-102-5/+8
| | | | |
| * | | | Revert "Remove unimplemented methods from header"Martin Jones2010-02-101-0/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit e712ecee850e04084643243a096befbf47e4e8b9.
| * | | | Revert "Replace QList<>* support with QmlListProperty"Martin Jones2010-02-1024-248/+350
| | | | | | | | | | | | | | | | | | | | This reverts commit d914555badcd4761864657e1e335e657b791453f.
| * | | | Revert "Compile"Martin Jones2010-02-101-2/+2
| | |_|/ | |/| | | | | | | | | | This reverts commit 0286ecdb8fc87b2c42d215aaabcbbffb5c508f01.
| * | | Fix expected error message.Martin Jones2010-02-101-3/+1
| | | |
| * | | Consolidate the two pathview tests and fix them all.Martin Jones2010-02-104-315/+89
| | | |
| * | | A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-092596-37/+318885
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3355 commits) Get test compiling Remove unimplemented methods from header Properly insert objects into the context's object list Missed a file Compile Replace QList<>* support with QmlListProperty Remove old implicit module support. Use networkAccessManagerFactory() for worker threads too. Connect to localhost instead of QHostAddress::Any. Fixes test on Windows. Support the other validators Add empty constructor for validators. Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType Document QtObject Changed define name to reflect change in Creator. re-enable QT_USE_FAST_CONCATENATION XMLHttpRequest collection bug For local fonts, we can just addApplicationFont() rather than loading data. The virtual keyboard is now working for TextEdit and TextInput components. Fix viewport size update. Make transformOrigin Center by default ...
| | * | Get test compilingAlan Alpert2010-02-091-1/+1
| | | | | | | | | | | | | | | | commit d914555badcd4761864657e1e335e657b791453f missed a spot
| | * | Remove unimplemented methods from headerKai Koehne2010-02-091-2/+0
| | | | | | | | | | | | | | | | Implementations got removed in d914555badcd4
| | * | Properly insert objects into the context's object listAlan Alpert2010-02-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a failing autotest, where the object's context pointer was not being reset. This was because the object was not placed properly in the context's contextObjects list and so was not found and cleared when the context was destroyed.
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-0932-387/+313
| | |\ \
| | | * | CompileAaron Kennedy2010-02-091-2/+2
| | | | |
| | | * | Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-0924-350/+248
| | | |/
| | | * Remove old implicit module support.Warwick Allison2010-02-094-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, it was allowed to use type qualification to refer to types defined in subdirectories - indeed, this was the only form of modularity. This is no longer desirable since we have good import features. Task-number: QTBUG-7721
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-091-3/+4
| | | |\
| | | | * Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qt-qmlBea Lam2010-02-0822-612/+523
| | | | |\
| | | | * | Connect to localhost instead of QHostAddress::Any. Fixes test on Windows.Bea Lam2010-02-081-3/+4
| | | | | |
| | | * | | Use networkAccessManagerFactory() for worker threads too.Martin Jones2010-02-092-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2850
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0813-565/+274
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-085-1/+148
| | | |\ \ \
| | | * | | | For local fonts, we can just addApplicationFont() rather than loading data.Martin Jones2010-02-081-4/+10
| | | | | | |
| | * | | | | Missed a fileAlan Alpert2010-02-091-0/+23
| | | |_|/ / | | |/| | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-085-511/+93
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-082593-35/+318808
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3342 commits) Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType Changed define name to reflect change in Creator. re-enable QT_USE_FAST_CONCATENATION XMLHttpRequest collection bug The virtual keyboard is now working for TextEdit and TextInput components. Fix viewport size update. Make transformOrigin Center by default Better documentation of "model" and "modelData" in delegates. clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true. Fix test. Allow objects to be shared between QmlEngines Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes). Fix item removal. Fixes: make qt-creator compile Make atBeginning/viewArea calculations account for min extent. Fix private header include. Fix autotest. Fix test. Fix test. Remove hacky fix (breaks autotest). ...
| | | | * | | | Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectTypeMarco Bubke2010-02-082-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need some internal stuff in the derived class. Reviewed-By: Kai Koehne
| | | | * | | | Changed define name to reflect change in Creator.Erik Verbruggen2010-02-081-2/+2
| | | | | | | |