Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-30 | 37 | -73/+1254 |
|\ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/debugger/qmldebug.cpp src/declarative/fx/qmlgraphicsimagebase_p.h src/declarative/util/qmlanimation.h src/declarative/util/qmlstate.h src/declarative/util/qmltimer.cpp | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-30 | 9 | -182/+67 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlcomponentjs.cpp src/declarative/qml/qmlcomponentjs_p.h src/declarative/qml/qmlcomponentjs_p_p.h | ||||
| | * | qdoc3: display 'read-only' in QML docs for read only properties. | Michael Brasser | 2009-10-30 | 4 | -6/+33 |
| | | | |||||
| | * | qdoc3: Fixed a linking error for qml properties. | Martin Smith | 2009-10-29 | 2 | -16/+14 |
| | | | | | | | | | | | | | | | | | | | | | This: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#rotation-prop should now be this: https://qtmetrics.europe.nokia.com/kinetic-declarativeui/qml-item.html#transformOrigin-prop) | ||||
| * | | fix headers | Warwick Allison | 2009-10-29 | 28 | -31/+1075 |
| | | | |||||
| * | | fix headers | Warwick Allison | 2009-10-29 | 4 | -20/+132 |
| | | | |||||
* | | | Fixup mistakes following renaming files | Aaron Kennedy | 2009-10-30 | 1 | -1/+1 |
| | | | |||||
* | | | Make private headers _p | Aaron Kennedy | 2009-10-30 | 13 | -20/+20 |
| | | | |||||
* | | | Rename qfx files to qmlgraphics files | Aaron Kennedy | 2009-10-30 | 2 | -2/+2 |
| | | | |||||
* | | | Rename QFx classes to QmlGraphics | Aaron Kennedy | 2009-10-30 | 5 | -46/+46 |
| |/ |/| | |||||
* | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 4 | -160/+20 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp src/script/api/qscriptprogram.cpp src/script/api/qscriptprogram.h src/script/api/qscriptprogram_p.h tests/auto/qscriptengine/tst_qscriptengine.cpp tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp tools/qdoc3/test/qt-inc.qdocconf | ||||
| * | make magic comment parsing stricter | Oswald Buddenhagen | 2009-10-28 | 1 | -9/+9 |
| | | | | | | | | | | | | there must be a space after the //: and similar comments, otherwise harmless comments of the sort of //====== foo here ===== will be parsed as message ids, etc. | ||||
| * | Add 800x480 to the qvfb configuration dialog | Rhys Weatherley | 2009-10-28 | 2 | -1/+11 |
| | | | | | | | | | | | | | | 800x480 is an increasingly common screen size on embedded devices, and specifying it via Custom sizes is annoying. Reviewed-by: Sarah Smith | ||||
| * | Doc: Remove unused file. | David Boddie | 2009-10-27 | 1 | -149/+0 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Use ShellMode for creator plugin expression widget. | Bea Lam | 2009-10-28 | 2 | -1/+10 |
| | | |||||
* | | Must delete query objects once disconnected. | Bea Lam | 2009-10-28 | 1 | -1/+8 |
| | | |||||
* | | Show contents of list properties within the debugger (like the Creator | Bea Lam | 2009-10-28 | 5 | -37/+87 |
| | | | | | | | | debugger). Also add Mode arg to ExpressionQueryWidget constructor. | ||||
* | | Auto-select first tree item after reload. | Bea Lam | 2009-10-28 | 2 | -2/+3 |
| | | |||||
* | | Fix crash bug where watch is already deleted | Bea Lam | 2009-10-28 | 1 | -1/+2 |
| | | |||||
* | | Fix context so files can be saved in Inspector mode, and colour | Bea Lam | 2009-10-27 | 3 | -10/+9 |
| | | | | | | | | Inspector output differently from appplication output. | ||||
* | | minor fixes | Bea Lam | 2009-10-27 | 2 | -3/+1 |
| | | |||||
* | | Show property type in separate column like Creator debugger. | Bea Lam | 2009-10-27 | 1 | -7/+8 |
| | | |||||
* | | Fix build target for standalone qmldebugger. | Bea Lam | 2009-10-27 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-10-27 | 2 | -45/+63 |
|\ \ | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | typo fixed in qmlviewer main menu | Joerg Bornemann | 2009-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: kkoehne | ||||
| * | | Fix for windows paths. | Warwick Allison | 2009-10-26 | 2 | -6/+15 |
| | | | | | | | | | | | | (i.e. nb. "\") | ||||
| * | | Fix "initial" size for remote content. | Warwick Allison | 2009-10-26 | 2 | -1/+8 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-26 | 13 | -31/+98 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Work again for URLs. | Warwick Allison | 2009-10-26 | 2 | -43/+45 |
| | | | | |||||
* | | | | Add qmldebugger/creatorplugin | Bea Lam | 2009-10-27 | 15 | -0/+1240 |
| | | | | |||||
* | | | | Move qmldebugger/ into qmldebugger/standalone dir. | Bea Lam | 2009-10-27 | 22 | -18/+20 |
| | | | | |||||
* | | | | Add -stayontop option. | Bea Lam | 2009-10-27 | 1 | -2/+9 |
| | | | | |||||
* | | | | Increase minimum height | Bea Lam | 2009-10-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Allow debugger components to be reset/cleared. | Bea Lam | 2009-10-27 | 10 | -38/+109 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-10-26 | 13 | -33/+1373 |
|\ \ \ | |/ / | | | | | | | into kinetic-declarativeui | ||||
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-25 | 10 | -28/+95 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp | ||||
| | * | Doc: Updated the modules for the "Desktop" (Full Framework) edition. | David Boddie | 2009-10-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod. | Martin Smith | 2009-10-23 | 4 | -14/+72 |
| | | | | | | | | | | | | They works just like the \qmlsignal and \qmlmethod commands. | ||||
| | * | consider message id when comparing messages | Oswald Buddenhagen | 2009-10-22 | 1 | -2/+6 |
| | | | |||||
| | * | id-based: do not drop unfinished untranslated messages | Oswald Buddenhagen | 2009-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | otherwise the fallback to use the source string is rather pointless | ||||
| | * | id-based: use source strings instead of empty translations only for ↵ | Oswald Buddenhagen | 2009-10-22 | 1 | -3/+4 |
| | | | | | | | | | | | | unfinished messages | ||||
| | * | actually guess the target language from the file name | Oswald Buddenhagen | 2009-10-22 | 1 | -0/+2 |
| | | | | | | | | | | | | --help says it does, but it didn't really. | ||||
| | * | Assistant: More useful error messages for help collections. | ck | 2009-10-21 | 1 | -6/+8 |
| | | | |||||
| | * | Revert "Switch from *-armv5 to *-armv6." | Frans Englich | 2009-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a6af1538ea53408399fb29870a4ef16a92c7893a. armv6 is not supported by public SDKs, due to armv6/urel not existing. Such SDKs needs to be fixed by copying the armv5 files. Hence we revert, and postpone until we have SDKs which actually support armv6, and until we have a stronger insight into what advantages armv6 brings. | ||||
| | * | Switch from *-armv5 to *-armv6. | Frans Englich | 2009-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change from armv5 to armv6 by default. This updates documentation, the convenience scripts, and the Raptor/abld qmake generator to use armv6 instead. Task-number: QTBUG-4891 Reviewed-by: Jason Barron | ||||
| | * | Assistant: Fix syntax error. | ck | 2009-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | The offending code is normally ifdef'ed out, so the bug did not manifest itself before. | ||||
| * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-10-22 | 13 | -19/+1598 |
| |\ \ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | Prepend element name for detailed attached property docs. | Michael Brasser | 2009-10-21 | 2 | -2/+6 |
| | | | | |||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-21 | 9 | -17/+321 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | doc now in globalobject.qdoc, not README | Warwick Allison | 2009-10-20 | 2 | -0/+1271 |
| | | | | | | | | | | | | | | | | | | | | QT-2335 |