Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into qtquick2 | Gunnar Sletta | 2011-05-04 | 10 | -9/+36 |
|\ | | | | | | | | | Conflicts: src/imports/particles/particles.pro | ||||
| * | Added .tag file with Git revision. | axis | 2011-05-03 | 2 | -0/+2 |
| | | |||||
| * | Fix compilation with private header patch | Olivier Goffart | 2011-05-02 | 1 | -1/+3 |
| | | |||||
| * | Use private headers | Marius Storm-Olsen | 2011-05-02 | 5 | -9/+9 |
| | | |||||
| * | Define the QT_NO_.... when the module is absant from QT_CONFIG | Olivier Goffart | 2011-05-02 | 1 | -0/+2 |
| | | | | | | | | Task-number: QTMODULARIZATION-38 | ||||
| * | Add module.prf, and install MODULE_PRI for each module | Marius Storm-Olsen | 2011-05-02 | 1 | -0/+4 |
| | | | | | | | | Output warning if not present | ||||
| * | Added dependency information to the sync.profile. | axis | 2011-04-27 | 1 | -0/+17 |
| | | |||||
* | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵ | Gunnar Sletta | 2011-05-04 | 43 | -391/+684 |
|\ \ | | | | | | | | | | into qtquick2 | ||||
| * | | Update SG items with GV item changes. | Martin Jones | 2011-05-04 | 21 | -262/+546 |
| | | | |||||
| * | | Fix QSGText autotests | Yann Bodson | 2011-05-04 | 1 | -55/+0 |
| | | | |||||
| * | | Fix crashing QtQuick 1 Image elements. | Martin Jones | 2011-05-04 | 1 | -2/+2 |
| | | | |||||
| * | | Code cleanup in QSGShaderEffectTexture. | Kim Motoyoshi Kalland | 2011-05-03 | 2 | -17/+15 |
| | | | |||||
| * | | Removed unused properties in QSGPaintedItem. | Yoann Lopes | 2011-05-03 | 2 | -30/+0 |
| | | | |||||
| * | | Added antialiasing property to QSGPaintedItem. | Yoann Lopes | 2011-05-03 | 4 | -1/+41 |
| | | | |||||
| * | | Start QtQuick2 section of whats new. | Alan Alpert | 2011-05-03 | 1 | -0/+6 |
| | | | | | | | | | | | | With the minor MouseArea behaviour change. | ||||
| * | | Affector Augmentation | Alan Alpert | 2011-05-03 | 7 | -10/+61 |
| | | | | | | | | | | | | | | | | | | Affectors gained shape and signal properties, and the affected(x,y) signal (turned on by the signal property, a theorized performance improvement). | ||||
| * | | Set ChildenDoNotOverlap flag on grids, lists and positioners. | Kim Motoyoshi Kalland | 2011-05-02 | 7 | -4/+9 |
| | | | | | | | | | | | | | | | | | | QSGGridView, QSGListView, QSGRow, QSGColumn, QSGGrid and QSGFlow now all set the ChildrenDoNotOverlap flag which allows the scene graph to render nodes in a more optimal order. | ||||
| * | | Fixed upside-down texture in QSGPaintedItem. | Kim Motoyoshi Kalland | 2011-05-02 | 1 | -11/+5 |
| | | | |||||
* | | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵ | Gunnar Sletta | 2011-05-02 | 14 | -57/+40 |
|\| | | | | | | | | | | | into qtquick2 | ||||
| * | | Support mirroring the source rectangle of ShaderEffectSource. | Kim Motoyoshi Kalland | 2011-04-29 | 2 | -5/+2 |
| | | | |||||
| * | | Revert "Flipped texture coordinates right way up." | Kim Motoyoshi Kalland | 2011-04-29 | 7 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ffb6fe57ee0ece18b6778889f7602811ab4ca822. Conflicts: src/declarative/scenegraph/qsgdefaultimagenode.cpp | ||||
| * | | Fixed signal passing between nested ShaderEffectItems. | Kim Motoyoshi Kalland | 2011-04-29 | 5 | -7/+10 |
| | | | |||||
| * | | Use a proper hash key for distance-field cache. | Yoann Lopes | 2011-04-29 | 2 | -27/+10 |
| | | | |||||
* | | | Timing for renderers | Gunnar Sletta | 2011-05-02 | 2 | -2/+71 |
| | | | |||||
* | | | Added a runtime option to enable consistent timing for animations | Gunnar Sletta | 2011-05-02 | 1 | -2/+7 |
| | | | |||||
* | | | Don't round flickable positions while panning | Gunnar Sletta | 2011-05-02 | 2 | -8/+8 |
|/ / | |||||
* | | Removed distfieldgen tool. | Yoann Lopes | 2011-04-29 | 3 | -275/+1 |
| | | | | | | | | Not needed anymore. | ||||
* | | Make text align in the same baseline | Jiang Jiang | 2011-04-29 | 2 | -11/+8 |
| | | | | | | | | (cherry picked from commit 3f0e1ac647cc8ab700b85772264bc2a95e5301fa) | ||||
* | | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵ | Gunnar Sletta | 2011-04-29 | 1 | -1/+0 |
|\ \ | | | | | | | | | | into qtquick2 | ||||
| * | | Fix detection of fonts with narrow outline in the distance-field cache. | Yoann Lopes | 2011-04-28 | 1 | -1/+0 |
| | | | |||||
* | | | specify dependencies for declarative | Gunnar Sletta | 2011-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | compile | Gunnar Sletta | 2011-04-28 | 1 | -0/+2 |
|/ / | |||||
* | | qmlplugindump: Fix --path usage with drive letters on Windows. | Christian Kamm | 2011-04-28 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Sort gradient stops for the convenience of the scenegraph | Alan Alpert | 2011-04-28 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
* | | Update particles to use QElapsedTimer | Alan Alpert | 2011-04-28 | 7 | -11/+10 |
| | | | | | | | | | | | | | | | | 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) | ||||
* | | Pre-accept events | Alan Alpert | 2011-04-28 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | 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) | ||||
* | | Add variable rotation speed to deformable particle | Alan Alpert | 2011-04-28 | 3 | -6/+45 |
| | | | | | | | | | | Change-Id: I105f18f0d7ec860de5d8bc8a9f3e4f007ea71ae2 (cherry picked from commit 41296b3ed046ddf73eca320bf0a97008decca287) | ||||
* | | Merged master into qtquick2. | axis | 2011-04-27 | 33 | -46/+470 |
|\| | |||||
| * | Add .gitignore to each module | axis | 2011-04-27 | 1 | -0/+261 |
| | | |||||
| * | Add tst_headersclean for each module | Liang Qi | 2011-04-27 | 4 | -0/+72 |
| | | |||||
| * | Modularized tst_compilerwarnings | Liang Qi | 2011-04-27 | 1 | -0/+51 |
| | | |||||
| * | Modularized tst_bic and add some helper functions for global test | Liang Qi | 2011-04-27 | 1 | -0/+5 |
| | | |||||
| * | Changed the path for qpluginbase.pri | Prasanth Ullattil | 2011-04-27 | 1 | -1/+1 |
| | | |||||
| * | Introduced the QT.<module>.plugins variable to module profiles. | axis | 2011-04-27 | 2 | -1/+2 |
| | | |||||
| * | Fixed parserstress test. | axis | 2011-04-27 | 2 | -20/+19 |
| | | |||||
| * | Switched to using QT.declaratice.imports variable. | axis | 2011-04-27 | 4 | -4/+4 |
| | | |||||
| * | Added QT.<module>.imports support to module profiles. | axis | 2011-04-27 | 1 | -0/+1 |
| | | |||||
| * | compile qtdeclarative/import | Olivier Goffart | 2011-04-27 | 1 | -2/+4 |
| | | |||||
| * | Make auto test build | Liang Qi | 2011-04-27 | 3 | -3/+3 |
| | | |||||
| * | Make each module refer to its own bin/ | Marius Storm-Olsen | 2011-04-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | 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 |