| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Merge f9b198987d2 resulted in two calls of the method.
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
src/imports/particles/particles.pro
|
| | |
|
| |
| |
| |
| | |
Not needed anymore.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since we can't import by such a path, we instead use a "." import
and set the uri of the component to the correct path.
Mirrors a change to qmldump in
qt-creator/0c8b4e38fab1862e3427aac7e7db68623bc7f174
Reviewed-by: Thomas Hartmann
|
|\| |
|
| | |
|
|/
|
|
|
| |
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
|
|
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
|