aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer
Commit message (Collapse)AuthorAgeFilesLines
* QmlViewer: Remove one call to enableDebuggingKai Koehne2011-05-101-2/+0
| | | | | | Merge f9b198987d2 resulted in two calls of the method. Reviewed-by: TrustMe
* QmlViewer: Translate UIKai Koehne2011-05-107-126/+142
| | | | | | | | | | | Install translators for the Qt & QmlViewer translations. also add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated strings. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14848 (cherry-picked from commit f33b31dcc1b8fd35501ab5b441a4529e2f8570f3)
* Merge branch 'master' into qtquick2Gunnar Sletta2011-05-041-1/+1
|\ | | | | | | | | Conflicts: src/imports/particles/particles.pro
| * Use private headersMarius Storm-Olsen2011-05-021-1/+1
| |
* | Merged master into qtquick2.axis2011-04-271-1/+1
|\|
| * Moved to using a feature profile instead of direct inclusion.axis2011-04-271-1/+1
| |
* | Initial import from qtquick2.Qt by Nokia2011-04-272-3/+5
|/ | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2741-0/+6303
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12