summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| | * re-enable QT_USE_FAST_CONCATENATIONErik Verbruggen2010-02-081-1/+1
| | | | | | | | | | | | includes workaround for breakage with old g++
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-081-507/+67
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Performance: Use QImage's smoothscaling instead of old private code
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-08171-957/+31224
| | |\ \
| | * | | Performance: Use QImage's smoothscaling instead of old private codeaavit2010-02-051-507/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For historical reasons, QJpegHandler had its own smoothscaling code. QImage's scaling has since evolved to become both faster and better, so avoid code duplication and just use QImage for scaling. Reviewed-by: Trond
* | | | | Support the other validatorsAlan Alpert2010-02-083-6/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-083-1/+21
| |_|_|/ |/| | | | | | | | | | | 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.
* | | | The virtual keyboard is now working for TextEdit and TextInput components.Alexis Menard2010-02-085-1/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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-082593-35/+318637
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-081-5/+63
| | |\ \ \
| | * | | | Make transformOrigin Center by defaultYann Bodson2010-02-082-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7430
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-082-22/+11
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Replace qt_vg_imageBits() with constBits() in the OpenVG code
| | * | | | Replace qt_vg_imageBits() with constBits() in the OpenVG codeRhys Weatherley2010-02-082-22/+11
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
* | | | | Fix viewport size update.Martin Jones2010-02-081-2/+4
| |_|/ / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-081-3/+9
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-02-0841-281/+342
| |\ \ \
| * | | | clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true.Yann Bodson2010-02-081-3/+9
| | | | |
* | | | | Better documentation of "model" and "modelData" in delegates.Martin Jones2010-02-081-5/+63
| |/ / / |/| | | | | | | | | | | Task-number: QTBUG-6396
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0841-275/+320
|\ \ \ \
| * | | | Allow objects to be shared between QmlEnginesAaron Kennedy2010-02-089-75/+112
| | | | | | | | | | | | | | | | | | | | QTBUG-7957
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-082-13/+13
| |\ \ \ \ | | |/ / /
| * | | | Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes).Bea Lam2010-02-0832-200/+208
| | | | | | | | | | | | | | | | | | | | Was causing some test failures on Windows.
* | | | | Fix test.Martin Jones2010-02-081-6/+22
| |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-080-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBill King2010-02-081-6/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBill King2010-02-081-2/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fixes: make qt-creator compileBill King2010-02-081-1/+1
| | | | | |
* | | | | | 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-083-2/+11
| |\ \ \ \
| * | | | | 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-qmlMartin Jones2010-02-0813-84/+119
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix autotest.Michael Brasser2010-02-082-0/+10
| |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-052592-35/+318503
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052592-35/+318503
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-056-45/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running" Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842) Get rid of setFirstActionActive on mouse release in QMenu
| | * | | | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-052-41/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 424eabac69df3234006669a69ca0ec9653e4ce63. The commit changed behavior of WA_QuitOnClose when WA_DontShowOnScreen was used, but WA_DontShowOnScreen should only have visual effects. Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
| | * | | | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2300 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The point in keeping this behaviour seems limited, and it is causing a bug on touch-screens where there are no mouse moves. Task-number: QTBUG-7907 Reviewed-by: ogoffart Reviewed-by: Thierry
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-054-39/+40
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings.
| | * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-2/+0
| | | | |
| | * | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| | | | |
generated by cgit v0.12 at 2025-02-01 00:05:02 (GMT)