| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Remove count:1 hack, make particles the right color.
|
|
|
|
|
| |
Fixed: Particle count changes had a noticable delay
Fixed: Changing from zero to non-zero didn't work
|
|
|
|
| |
QLineControl is integrated here, so no more need for qfxlineedit branch
|
|\
| |
| |
| | |
into kinetic-declarativeui
|
| |
| |
| |
| | |
Doesn't seem to hurt anything, and it was ugly API.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
This is probably more correct, but is also the way it used to behave.
|
| |
| |
| |
| |
| | |
Also it should be executed a little later to avoid accidental behaviour
changes.
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
createStandardContextMenu should still only cut/copy in normal echo mode
and the Qt3Support function validateAndSet will again only set if it is
validated.
|
| |
| |
| |
| |
| | |
It was accidentally left commented out instead of working with
QLineControl.
|
| |
| |
| |
| |
| |
| | |
QAbstractSpinBox had some code using QLineEdit internals, this had to
be move to use QLineControl as well.
This commit also includes fixing some typos in my last commit.
|
| |
| |
| |
| |
| | |
Didn't notice there were still some TODO markers left. They have now all
been done.
|
| |
| |
| |
| |
| | |
This change to QLineEdit didn't merge, as it needs to be applied to
QLineControl in this case.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Splits out the control logic of QLineEdit into QLineControl, which is
somewhat similar to QTextEdit. This was originally worked on in the
ianws-qt-lineedit-textedit-research repository, and then further
developed in kinetic in the kinetic-declarativeui-qfxlineedit branch.
Note that this also includes a tiny change to qvalidator.h which allows
validators to be used in qml.
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
-Uses a more familar rule set
-Default theme swapped
-Sizing altered. Now the tiles are 40x40 so as to be able to be pretty
and have shiny animations, board size is set by what can fit in the
game canvas.
|
| |/ /
|/| | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Turns out this simple approach doesn't work. Fortunately we have a volunteer to do it properly.
This reverts commit 958dc50e2b0fe2e875a704554438be75907ed3c5.
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | |
|
| | | | | |
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Handle palette changes in QmlPalette.
|
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | | |
This demo primarily demonstrates use of JS and dynamic creation with
QML, by creating a functional and animated game entirely with QML & JS
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/qmljsparser.cpp
|
| | | | | |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlscriptparser.cpp
src/declarative/qml/qmlscriptparser_p.h
Compiles, but probably next needs a revert/change of module stuff,
since that work seems to have been duplicated.
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This will allow, for example, a different set of types to be
imported for "import Qt 4.6" than for "import Qt 4.7".
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Works same as before for now, but now the variables and methods are
all in the right place. In particular, type resolving is per-component,
not per-engine, even though it is the engine that ultimately has the
ability to find types, because each component will have a different set
of available types.
Designed to be optimizable - QmlEngine could share data between QmlEngine::Import
objects, and the import objects could read types in bulk rather than always searching.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Bug 256967 still stops it working correctly.
|