Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | The virtual keyboard is now working for TextEdit and TextInput components. | Alexis Menard | 2010-02-08 | 2 | -1/+97 |
| | | | | | | | | | 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-qml | Martin Jones | 2010-02-08 | 34 | -200/+237 |
|\ | |||||
| * | Allow objects to be shared between QmlEngines | Aaron Kennedy | 2010-02-08 | 2 | -0/+29 |
| | | | | | | | | QTBUG-7957 | ||||
| * | Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes). | Bea Lam | 2010-02-08 | 32 | -200/+208 |
| | | | | | | | | Was causing some test failures on Windows. | ||||
* | | Fix test. | Martin Jones | 2010-02-08 | 1 | -6/+22 |
|/ | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-08 | 5 | -30/+29 |
|\ | |||||
| * | Fix autotest. | Michael Brasser | 2010-02-08 | 2 | -0/+10 |
| | | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵ | Qt Continuous Integration System | 2010-02-05 | 1504 | -0/+174888 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ... | ||||
| * | | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running" | Tor Arne Vestbø | 2010-02-05 | 1 | -30/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Sondergaard | 2010-02-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | Merge-request: 2300 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> | ||||
| * | | Get rid of setFirstActionActive on mouse release in QMenu | Pierre Rossi | 2010-02-05 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | Fix test. | Martin Jones | 2010-02-05 | 1 | -2/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 2 | -0/+46 |
|\ \ | |||||
| * | | Fix Behaviors for object-type properties. | Michael Brasser | 2010-02-05 | 2 | -0/+46 |
| | | | | | | | | | | | | Task-number: QT-2269 | ||||
* | | | Fix test. | Martin Jones | 2010-02-05 | 1 | -2/+1 |
|/ / | |||||
* | | Fix bad merge (compile) | Warwick Allison | 2010-02-05 | 1 | -83/+0 |
| | | |||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 13 | -24/+24 |
|\ \ | |||||
| * | | Test fixes. | Michael Brasser | 2010-02-05 | 8 | -12/+12 |
| | | | |||||
| * | | More test fixes. | Michael Brasser | 2010-02-05 | 5 | -12/+12 |
| | | | |||||
* | | | Fix ListView tests. | Martin Jones | 2010-02-05 | 1 | -11/+27 |
|/ / | |||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 4 | -2/+5 |
|\ \ | |||||
| * | | Test fixes. | Michael Brasser | 2010-02-05 | 3 | -2/+3 |
| | | | |||||
| * | | Add a QEXPECT_FAIL for known bug. | Michael Brasser | 2010-02-05 | 1 | -0/+2 |
| | | | |||||
* | | | Update test to handle QmlNetworkAccessManagerFactory | Martin Jones | 2010-02-05 | 1 | -19/+22 |
|/ / | |||||
* | | Fix autotest. | Michael Brasser | 2010-02-05 | 1 | -49/+43 |
| | | | | | | | | The vme instruction set has changed. | ||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵ | Qt Continuous Integration System | 2010-02-05 | 1504 | -0/+174910 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ... | ||||
| * | Re-add accidentally deleted file | Aaron Kennedy | 2010-02-04 | 1 | -0/+6 |
| | | |||||
| * | Test SizeItemToLoader to SizeLoaderToItem resizeMode change. | Martin Jones | 2010-02-04 | 1 | -0/+7 |
| | | | | | | | | Task-number: QT-2376 | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-04 | 1503 | -0/+174897 |
| |\ | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp | ||||
| | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Michael Brasser | 2010-02-04 | 167 | -372/+1329 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | XMLHttpRequest redirection | Aaron Kennedy | 2010-02-03 | 7 | -0/+149 |
| | | | | |||||
| | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 6 | -0/+109 |
| | | |\ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * | Test case for QTBUG-7860 | Aaron Kennedy | 2010-02-03 | 2 | -0/+16 |
| | | | | | |||||
| | | | * | Missing files | Aaron Kennedy | 2010-02-03 | 3 | -0/+44 |
| | | | | | |||||
| | | | * | Test for default property ordering | Aaron Kennedy | 2010-02-03 | 2 | -0/+49 |
| | | | | | |||||
| | | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 74 | -70/+776 |
| | | |\ \ | | | | |/ | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | | * | Fix insertion and deletion of multiple items in GridView. | Martin Jones | 2010-02-02 | 1 | -5/+7 |
| | | | | | |||||
| | | | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2010-02-02 | 73 | -65/+769 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp | ||||
| | | * | | | Disallow ids that start with uppercase letters and update docs and | Bea Lam | 2010-02-03 | 80 | -293/+288 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786 | ||||
| | | * | | Fix test timings | Alan Alpert | 2010-02-01 | 1 | -8/+7 |
| | | | | | |||||
| | | * | | Revert "Qt has more stuff in rich text now." | Alan Alpert | 2010-02-01 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 3f095e957f27744c9c7a79679e35bfcc9db161fd. | ||||
| | * | | | Fix elision and multilength strings when resizing a Text element. | Michael Brasser | 2010-02-04 | 15 | -65/+2362 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | They were incorrectly wrapping when the width changed. Task-number: QTBUG-7477 | ||||
| | * | | Support animating attached properties. | Michael Brasser | 2010-02-01 | 2 | -0/+46 |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-5580 | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-01-29 | 19 | -54/+761 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Convert lists to variants on assignment. | Aaron Kennedy | 2010-01-28 | 2 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | QTBUG-5675 | ||||
| | | * | | Support builtin string converters in every context | Aaron Kennedy | 2010-01-28 | 3 | -2/+298 |
| | | | | | | | | | | | | | | | | | | | | QTBUG-6919 | ||||
| | | * | | Assigning undefined resets QObject properties | Aaron Kennedy | 2010-01-28 | 3 | -1/+50 |
| | | | | | |||||
| | | * | | Add reset methods to QmlMetaProperty | Aaron Kennedy | 2010-01-28 | 1 | -0/+93 |
| | | | | | |||||
| | | * | | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2010-01-27 | 14 | -50/+299 |
| | | |\ \ | |||||
| | * | | | | Don't crash when accessing index -1 | Martin Jones | 2010-01-29 | 1 | -1/+5 |
| | |/ / / |