summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Better default behaviour for twitter demo.Alan Alpert2009-09-031-0/+1
|
* Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-031-3/+181
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0349-399/+994
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | DocAaron Kennedy2009-09-031-3/+181
| | |
* | | Differentiate between loading and error states.Alan Alpert2009-09-031-1/+7
| | |
* | | Close dialogs if they press new gameAlan Alpert2009-09-031-2/+7
| |/ |/| | | | | Also only has one dialog shown when you win.
* | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0323-350/+482
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-09-037-267/+213
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-034-1/+12
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Remove dragMode property from Flickable.Martin Jones2009-09-035-186/+71
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-0364-421/+1235
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Update changes file.Martin Jones2009-09-031-0/+4
| | | | | |
| | * | | | Flickable visible area properties moved into visibleArea as dot props.Martin Jones2009-09-035-97/+154
| | | | | |
| * | | | | Round out AnchorChanges API.Michael Brasser2009-09-032-4/+101
| | |_|/ / | |/| | |
| * | | | Fix bug when cancelling anchor change mid-transition.Michael Brasser2009-09-034-1/+12
| | |/ / | |/| |
| * | | Add one more animation test.Michael Brasser2009-09-031-0/+19
| | | |
| * | | Get animation autotests working again, and add a few more.Michael Brasser2009-09-0312-79/+138
| | | |
* | | | Move minehunt and twitter to demos directoryAlan Alpert2009-09-0323-0/+444
| | | | | | | | | | | | | | | | | | | | Minehunt is more a demo than an example, and the twitter app goes with the flickr app.
* | | | Cleanup minehunt exampleAlan Alpert2009-09-032-49/+57
|/ / /
* | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0326-232/+750
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Remove dead testAaron Kennedy2009-09-033-146/+0
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0318-1/+432
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| | * | Make it easier to test examples with EGL.Michael Brasser2009-09-024-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | Currently -graphicssystem opengl is not very reliable with EGL, so we've added a -opengl option to qmlviewer which sets the viewport of the view to a QGLWidget and allows for GL testing.
| | * | Add basic autotests for state handling.Michael Brasser2009-09-0211-0/+399
| | | |
| * | | Add QML enum supportAaron Kennedy2009-09-039-19/+213
| | | | | | | | | | | | | | | | | | | | | | | | Enums are accessed as <Type Name>.<Enum value name> Currently this is highly unoptimal - enum assignments are not detected in the compiler, nor are they cached in the script engine.
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0212-34/+44
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0218-80/+271
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt Conflicts: demos/declarative/samegame/content/samegame.js
| * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-02145-1579/+2317
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| * | | | | | Rework script binding methodAaron Kennedy2009-09-023-81/+126
| | | | | | |
* | | | | | | Fix a bug in the qmlvme, which lead to an assert on valid QML.Alan Alpert2009-09-033-0/+11
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As QmlComponents are created outside the CreateObject instruction, they could be created with an uninitalized declarative data member. Also this patch sets the column on CreateObject instructions too. Reviewed-by: Aaron Kennedy
* | | | | | Add an assert before we dereference a null pointerAlan Alpert2009-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
* | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0212-34/+44
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-025-64/+118
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Disallow using typenames as idsAaron Kennedy2009-09-0212-34/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now illegal: import Qt 4.6 Item { id: Item } as is import Qt 4.6 Item { id: Text }
* | | | | | Slightly better name dialog for SameGameAlan Alpert2009-09-021-1/+2
| | | | | |
* | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0210-67/+153
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-09-0229-58/+303
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0218-36/+151
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | Save object creation line and column numberAaron Kennedy2009-09-025-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This info is used by the debugger interface, and by the qmlInfo() stream.
| * | | | | | Provide some color manipulation functions.Michael Brasser2009-09-025-64/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These may not be the final location for these, but it allows us to start testing.
* | | | | | | SameGame score XSLT now sorts by score.Alan Alpert2009-09-021-0/+1
| |_|/ / / / |/| | | | |
* | | | | | Don't need to tweet high scores tooAlan Alpert2009-09-021-17/+0
| | | | | |
* | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0216-39/+142
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Fixed crash in keyPressed. keyToSignal function suppose to return “const ↵Mehul R. Patel2009-09-021-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | QbyteArray” not “const char *”. Crash was coming because keyPressed was getting invalid memory pointer from keyToSignal function. Merge-request: 1374 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * | | | Flickable locked property changed to interactive.Martin Jones2009-09-0210-22/+29
| | | | | | | | | | | | | | | | | | | | Note that the meaning of the property has been reversed.
| * | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-025-12/+108
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-021-7/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Add TextInput key handling testAaron Kennedy2009-09-023-0/+107
| | | | | |
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-02131-1546/+2168
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Remove unused member variables from QmlEnginePrivateAaron Kennedy2009-09-012-12/+1
| | | | |