summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QML Object toString should use 64-bit address on 64-bit platformsAaron Kennedy2010-02-111-1/+1
|
* Fix tst_qmlecmascript::callQtInvokablesAaron Kennedy2010-02-111-6/+8
| | | | | | The assert in qmlobjectscriptclass.cpp is valid when the call is running in a correctly created QML environment, but not valid for the test case which bypasses QML.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-10316-14/+106449
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102-9/+16
| |\
| | * Make sure item release isn't deferred indefinatelyMartin Jones2010-02-102-9/+16
| | |
| * | Attempt to clairify highlight range docsAlan Alpert2010-02-101-0/+10
| |/
| * CrashAaron Kennedy2010-02-101-0/+2
| |
| * 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-1019-215/+318
| | | | | | | | This reverts commit d914555badcd4761864657e1e335e657b791453f.
| * 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-09315-11/+106320
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | * 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.
| | * Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-0919-318/+215
| | |
| | * Remove old implicit module support.Warwick Allison2010-02-092-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * 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-0810-558/+183
| | |\
| | | * 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-08314-9/+106365
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| | | | | * re-enable QT_USE_FAST_CONCATENATIONErik Verbruggen2010-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | includes workaround for breakage with old g++
| | | * | | Support the other validatorsAlan Alpert2010-02-082-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that a resolution will be required for QTBUG-8025 before the QRegExpValidator is useful. Task-number: QTBUG-7068
| | | * | | Add empty constructor for validators.Alan Alpert2010-02-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to use them in QML. Also adds Q_ENUMS macro for an enum used by QDoubleValidator. Reviewed-by: trustme
| | | * | | Document QtObjectAlan Alpert2010-02-081-0/+19
| | | | |/ | | | |/| | | | | | | | | | | Task-number:QTBUG-6034
| | | * | XMLHttpRequest collection bugAaron Kennedy2010-02-081-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlXMLHttpRequest was holding a reference to the callback function indefinately. If the callback function also referenced the XMLHttpRequest (which they always do) the QmlXMLHttpRequest would not be destroyed until the application exited.
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-083-0/+51
| | |\ \ \ | | | |/ /
| | | * | The virtual keyboard is now working for TextEdit and TextInput components.Alexis Menard2010-02-083-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to show the virtual keyboard we need to send RequestSoftwareInputPanel. I also fixed TextInput regarding the inputQuery implementation. Task-number:QTBUG-7602 Reviewed-by:akennedy
| | * | | For local fonts, we can just addApplicationFont() rather than loading data.Martin Jones2010-02-081-4/+10
| | |/ /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-084-36/+25
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-08314-9/+106290
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3336 commits) 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). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. ...
| | | | * | Make transformOrigin Center by defaultYann Bodson2010-02-082-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7430
| | * | | | Fix viewport size update.Martin Jones2010-02-081-2/+4
| | | |/ / | | |/| |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-087-75/+83
| | |\ \ \
| | | * | | Allow objects to be shared between QmlEnginesAaron Kennedy2010-02-087-75/+83
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-7957
| | * | | | clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true.Yann Bodson2010-02-081-3/+9
| | |/ / /
| | * | | Fix item removal.Martin Jones2010-02-081-7/+7
| | | | |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-081-1/+1
| | |\ \ \
| | | * | | Fix private header include.Bea Lam2010-02-081-1/+1
| | | | | |
| | * | | | Make atBeginning/viewArea calculations account for min extent.Martin Jones2010-02-081-6/+6
| | |/ / /
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-05314-9/+106276
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits) Fix test. Remove hacky fix (breaks autotest). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. Test fixes. More test fixes. Clean up QmlImageReader thread on engine destruction. Update test to handle QmlNetworkAccessManagerFactory Test fixes. Add a QEXPECT_FAIL for known bug. Fix autotest. Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. ...
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-05314-9/+106276
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits) Fix test. Remove hacky fix (breaks autotest). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. Test fixes. More test fixes. Clean up QmlImageReader thread on engine destruction. Update test to handle QmlNetworkAccessManagerFactory Test fixes. Add a QEXPECT_FAIL for known bug. Fix autotest. Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. ...
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0514-97/+95
| | | | |\ \ \
| | | | | * | | Remove hacky fix (breaks autotest).Michael Brasser2010-02-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proper fix should be in 4.6 soon.
| | | | | * | | Fix Behaviors for object-type properties.Michael Brasser2010-02-052-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2269
| | | | | * | | Pass symbols::prefix (Action -> QmlAction)Warwick Allison2010-02-0511-93/+93
| | | | | | | |
| | | | * | | | Fix test.Martin Jones2010-02-051-7/+17
| | | | |/ / /
| | | | * | | Fix ListView tests.Martin Jones2010-02-051-4/+6
| | | | | | |
| | | | * | | Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-053-12/+21
| | | | | | |
| | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-05314-9/+106257
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...