summaryrefslogtreecommitdiffstats
path: root/tools/qml
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-047-129/+144
|\
| * QmlViewer: Translate UIKai Koehne2011-05-027-126/+142
| * Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-141-0/+3
| |\
| * \ Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-161-0/+2
| |\ \
| * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-stagingMartin Jones2011-03-012-8/+6
| |\ \ \
| * \ \ \ Merge branch 'master' of ../qt-qml-stagingMartin Jones2011-02-177-47/+89
| |\ \ \ \
| * | | | | Make -no-opengl exist on other platformsAlan Alpert2011-02-041-3/+2
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-1/+1
|\ \ \ \ \ \
| * | | | | | Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-191-1/+1
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Sym...Tom Sutcliffe2011-04-141-1/+1
| * | | | | QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'Kai Koehne2011-04-141-1/+1
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | QmlViewer: Enable remote qml debuggingKai Koehne2011-04-061-0/+3
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-0/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-6/+4
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-3/+3
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-201-3/+7
| | |\ \ \
| | | * | | Attempt to fix symbian 3.1 and 3.2 compile break.Jason McDonald2011-02-181-3/+7
| * | | | | Another stab at fixing compilation on old Symbian platformsJoona Petrell2011-02-222-5/+3
| |/ / / /
| * | | | Fix compilation on old Symbian platformsJoona Petrell2011-02-181-1/+1
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-171-2/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-111-2/+2
| |/ /
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-047-47/+89
|\ \ \ | |/ / | | / | |/ |/|
| * Froze Symbian def files for QtQuick11.juhvu2011-02-011-0/+5
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1918-20/+18
| |\
| * | Fix declarative autotest compilation on SymbianJoona Petrell2011-01-182-10/+13
| * | Add a way to clear warnings in qmlviewer warnings window on SymbianJoona Petrell2011-01-182-1/+8
| * | Add a warning when translating QML application in qmlviewer failsJoona Petrell2011-01-171-2/+5
| * | Remove unnecessary debug traces from declarative classesJoona Petrell2011-01-171-1/+0
| * | Add no warnings label to qmlviewer warnings windowJoona Petrell2011-01-102-1/+18
| * | Provide qmlviewer warning window also on SymbianJoona Petrell2010-12-313-31/+35
| * | Forward qmlviewer traces to system's default message handler on SymbianJoona Petrell2010-12-301-4/+3
| * | QDeclarativeDebug: Include debugger plugin in qmlviewer.sisKai Koehne2010-12-171-0/+5
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1718-18/+18
|\ \ \ | | |/ | |/|
| * | Update copyright year to 2011.Jason McDonald2011-01-1018-18/+18
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-071-2/+0
|\ \ \ | |/ /
| * | QmlViewer: Remove unused class variablesKai Koehne2011-01-071-2/+0
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-138-48/+48
|\ \ | |/
| * Build on SymbianMartin Jones2010-12-121-13/+13
| * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-104-7/+7
| * QmlViewer: Remove trailing whitespaceKai Koehne2010-12-106-18/+18
| * QmlViewer: Fix crash on exitKai Koehne2010-12-101-21/+21
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-063-3/+12
|\ \ | |/
| * Give qmlviewer a minimum size if root object has no size.Bea Lam2010-12-031-1/+1
| * Fix Browser.qml warningsJoona Petrell2010-11-301-2/+2
| * Fixup visual tests on MacAlan Alpert2010-11-251-0/+9
* | QScroller merge, part 1Robert Griebl2010-12-021-6/+6
|/
* Prevent crash when calling reload() from within a .qmlDamian Jansen2010-11-231-1/+1