Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2010-02-16 | 135 | -138/+150 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ... | ||||
| * | Fix copyright year. | Jason McDonald | 2010-02-16 | 135 | -135/+135 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 1 | -1/+1 |
| | | |||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 3 | -2/+14 |
| | | |||||
* | | Prepare translations of the declarative module. | Friedemann Kleint | 2010-02-15 | 2 | -9/+9 |
|/ | | | | | Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr(). | ||||
* | Fix warnings | Aaron Kennedy | 2010-02-12 | 1 | -1/+1 |
| | |||||
* | Reference count shared expression data | Aaron Kennedy | 2010-02-12 | 2 | -1/+7 |
| | | | | | | QmlExpression uses data from the QmlCompiledComponent (eg. expression string data). It must therefore hold a reference to the QmlCompiledComponent to prevent the data being deleted. | ||||
* | Cleanup public QmlMetaType API | Aaron Kennedy | 2010-02-12 | 11 | -154/+109 |
| | | | | Remove some unnecessary methods from the QmlMetaType class | ||||
* | QML Object toString should use 64-bit address on 64-bit platforms | Aaron Kennedy | 2010-02-11 | 1 | -1/+1 |
| | |||||
* | Fix tst_qmlecmascript::callQtInvokables | Aaron Kennedy | 2010-02-11 | 1 | -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. | ||||
* | Crash | Aaron Kennedy | 2010-02-10 | 1 | -0/+2 |
| | |||||
* | Revert "Remove unimplemented methods from header" | Martin Jones | 2010-02-10 | 1 | -0/+2 |
| | | | | This reverts commit e712ecee850e04084643243a096befbf47e4e8b9. | ||||
* | Revert "Replace QList<>* support with QmlListProperty" | Martin Jones | 2010-02-10 | 10 | -166/+270 |
| | | | | This reverts commit d914555badcd4761864657e1e335e657b791453f. | ||||
* | Remove unimplemented methods from header | Kai Koehne | 2010-02-09 | 1 | -2/+0 |
| | | | | Implementations got removed in d914555badcd4 | ||||
* | Properly insert objects into the context's object list | Alan Alpert | 2010-02-09 | 1 | -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 QmlListProperty | Aaron Kennedy | 2010-02-09 | 10 | -270/+166 |
| | |||||
* | Remove old implicit module support. | Warwick Allison | 2010-02-09 | 2 | -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 Jones | 2010-02-09 | 2 | -14/+20 |
| | | | | Task-number: QT-2850 | ||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-08 | 2 | -3/+3 |
|\ | |||||
| * | Changed define name to reflect change in Creator. | Erik Verbruggen | 2010-02-08 | 1 | -2/+2 |
| | | |||||
| * | re-enable QT_USE_FAST_CONCATENATION | Erik Verbruggen | 2010-02-08 | 1 | -1/+1 |
| | | | | | | | | includes workaround for breakage with old g++ | ||||
* | | Document QtObject | Alan Alpert | 2010-02-08 | 1 | -0/+19 |
|/ | | | | Task-number:QTBUG-6034 | ||||
* | XMLHttpRequest collection bug | Aaron Kennedy | 2010-02-08 | 1 | -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. | ||||
* | Allow objects to be shared between QmlEngines | Aaron Kennedy | 2010-02-08 | 7 | -75/+83 |
| | | | | QTBUG-7957 | ||||
* | Fix Behaviors for object-type properties. | Michael Brasser | 2010-02-05 | 1 | -1/+1 |
| | | | | Task-number: QT-2269 | ||||
* | Clean up QmlImageReader thread on engine destruction. | Martin Jones | 2010-02-05 | 1 | -0/+2 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-04 | 1 | -1/+2 |
| | | | | | | | | 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 ↵ | Martin Jones | 2010-02-03 | 4 | -24/+42 |
|\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp | ||||
| * | Don't create one QNetworkAccessManager per XMLHttpRequest | Aaron Kennedy | 2010-02-03 | 4 | -31/+49 |
| | | |||||
* | | Really run image reader in its own thread. | Martin Jones | 2010-02-03 | 5 | -37/+2 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2010-02-03 | 1 | -12/+32 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | XMLHttpRequest redirection | Aaron Kennedy | 2010-02-03 | 1 | -12/+32 |
| | | |||||
* | | We use JavaScript, not ECMAScript. | Martin Jones | 2010-02-03 | 2 | -3/+3 |
|/ | | | | Task-number: QTBUG-7720 | ||||
* | Don't enforce lower-case starting letters for ids yet; just print a | Bea Lam | 2010-02-03 | 1 | -2/+5 |
| | | | | warning for now. | ||||
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 1 | -2/+49 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | Honor default property ordering | Aaron Kennedy | 2010-02-03 | 1 | -2/+49 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 3 | -6/+6 |
|\ \ | |/ | | | | | into kinetic-declarativeui | ||||
| * | Compile. | Warwick Allison | 2010-02-03 | 3 | -6/+6 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2010-02-03 | 3 | -6/+6 |
|\ \ | |/ | | | | | into kinetic-declarativeui | ||||
| * | The depot (4.6.2) does not have the Value patch yet, adjust version checks | Warwick Allison | 2010-02-02 | 3 | -6/+6 |
| | | | | | | | | accordingly. | ||||
* | | Disallow ids that start with uppercase letters and update docs and | Bea Lam | 2010-02-03 | 1 | -1/+4 |
|/ | | | | | | examples accordingly. Task-number: QT-2786 | ||||
* | Don't use statics for type definition, at least for plugin modules. | Warwick Allison | 2010-02-01 | 3 | -3/+35 |
| | | | | Task-number: QT-2798 | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2010-02-01 | 51 | -3061/+3564 |
|\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/qmlpixmapcache.cpp | ||||
| * | Add new files. | Martin Jones | 2010-01-29 | 2 | -0/+163 |
| | | |||||
| * | Move image network access into a separate thread, with decoding. | Martin Jones | 2010-01-29 | 4 | -23/+61 |
| | | |||||
| * | Convert lists to variants on assignment. | Aaron Kennedy | 2010-01-28 | 3 | -6/+32 |
| | | | | | | | | QTBUG-5675 | ||||
| * | Optimization: Skip attached property search where possible | Aaron Kennedy | 2010-01-28 | 3 | -17/+22 |
| | | | | | | | | QTBUG-6734 | ||||
| * | Support builtin string converters in every context | Aaron Kennedy | 2010-01-28 | 4 | -32/+83 |
| | | | | | | | | QTBUG-6919 | ||||
| * | Assigning undefined resets QObject properties | Aaron Kennedy | 2010-01-28 | 2 | -5/+15 |
| | | |||||
| * | Add reset methods to QmlMetaProperty | Aaron Kennedy | 2010-01-28 | 2 | -0/+27 |
| | |