summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Gunnar Sletta [Fri, 29 Apr 2011 07:14:55 +0000 (09:14 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Fri, 29 Apr 2011 07:14:42 +0000 (09:14 +0200)]
specify dependencies for declarative
Gunnar Sletta [Thu, 28 Apr 2011 15:54:07 +0000 (17:54 +0200)]
compile
Yoann Lopes [Thu, 28 Apr 2011 13:46:20 +0000 (15:46 +0200)]
Fix detection of fonts with narrow outline in the distance-field cache.
Christian Kamm [Thu, 28 Apr 2011 10:22:30 +0000 (12:22 +0200)]
qmlplugindump: Fix --path usage with drive letters on Windows.
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
Alan Alpert [Wed, 27 Apr 2011 00:46:24 +0000 (10:46 +1000)]
Sort gradient stops for the convenience of the scenegraph
The scenegraph gradients require sorted graident stops, whereas QML does
not. Gradient stops are now sorted at the point they are passed into the
scenegraph.
Change-Id: I499dd00dc78e60dfc2053f2ee3691e61e0cf2a5d
Task-number: QTBUG-18494
Reviewed-by: Martin Jones
(cherry picked from commit
8cbd68b29224eed19f6ca6ec8186766c69a35c83)
Alan Alpert [Wed, 27 Apr 2011 01:19:24 +0000 (11:19 +1000)]
Update particles to use QElapsedTimer
Step one of fixing the limited lifetime bug. As this step should also
increase the lifetime 'a lot' step two may take a while.
Change-Id: I87bbe762803451f751e23d4bf8559c662fdf57a3
(cherry picked from commit
9cf15c135373f8190bf2cb62f9f99890cacf7d88)
Alan Alpert [Wed, 27 Apr 2011 03:27:13 +0000 (13:27 +1000)]
Pre-accept events
Key handler expects events to be accepted, and will ignore them if
necessary.
Change-Id: I8ee110d70c98ff7c2de107b44e7d51aab12678c4
Reviewed-by: Michael Brasser
(cherry picked from commit
6476bbea1d7905f083789224accc8f4b43a0779b)
Alan Alpert [Wed, 27 Apr 2011 05:40:20 +0000 (15:40 +1000)]
Add variable rotation speed to deformable particle
Change-Id: I105f18f0d7ec860de5d8bc8a9f3e4f007ea71ae2
(cherry picked from commit
41296b3ed046ddf73eca320bf0a97008decca287)
axis [Wed, 27 Apr 2011 12:13:27 +0000 (14:13 +0200)]
Merged master into qtquick2.
Qt by Nokia [Wed, 27 Apr 2011 12:13:26 +0000 (14:13 +0200)]
Initial import from qtquick2.
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test
Prasanth Ullattil [Wed, 23 Mar 2011 09:55:02 +0000 (10:55 +0100)]
Changed the path for qpluginbase.pri
axis [Tue, 22 Mar 2011 12:20:53 +0000 (13:20 +0100)]
Introduced the QT.<module>.plugins variable to module profiles.
axis [Mon, 21 Mar 2011 11:55:15 +0000 (12:55 +0100)]
Fixed parserstress test.
axis [Thu, 17 Mar 2011 09:58:42 +0000 (10:58 +0100)]
Switched to using QT.declaratice.imports variable.
axis [Thu, 17 Mar 2011 09:57:48 +0000 (10:57 +0100)]
Added QT.<module>.imports support to module profiles.
Olivier Goffart [Tue, 11 Jan 2011 10:09:56 +0000 (11:09 +0100)]
compile qtdeclarative/import
Liang Qi [Fri, 7 Jan 2011 12:47:49 +0000 (13:47 +0100)]
Make auto test build
Marius Storm-Olsen [Thu, 6 Jan 2011 18:52:17 +0000 (12:52 -0600)]
Make each module refer to its own bin/
Since modules cannot rely on QtCore having a build directory, nor
can they build the applications directly into $$[QT_INSTALL_BINS]
each module needs their own bin/. Add this path to each module's
pri file, so others can use their applications
axis [Mon, 3 Jan 2011 18:01:57 +0000 (19:01 +0100)]
Extended module profiles.
Each module now sets the QT_CONFIG variable itself.
Liang Qi [Thu, 23 Dec 2010 08:38:00 +0000 (09:38 +0100)]
Add the private_includes path to the modules .pri file
Marius Storm-Olsen [Fri, 17 Dec 2010 05:34:20 +0000 (23:34 -0600)]
Add the source path to the modules .pri file
Liang Qi [Thu, 25 Nov 2010 14:20:01 +0000 (15:20 +0100)]
Make declarative compile.
Qt by Nokia [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Initial import from the monolithic Qt.
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
axis [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Moved to using a feature profile instead of direct inclusion.