summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-0364-421/+1235
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * 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
| |
| * 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
| * | | | | | SameGame now asks for a name and saves your score.Alan Alpert2009-09-023-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Included a rewriting of the Dialog item to be half-decent. Watch http://qtfx-nokia.trolltech.com.au/samegame/scores.php on the internal network for highscores!
| * | | | | | SameGame high score server support.Alan Alpert2009-09-025-1/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit contains all the functionality for sending high scores to a server, and the server. The server files have been installed at http://qtfx-nokia.trolltech.com.au/samegame for internal testing.
* | | | | | | 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
| |/ / / / / |/| | | | |
* | | | | | 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
| | | |
* | | | Clear animation only in the direction being fixed in fixupX/Y.Martin Jones2009-09-021-4/+4
| |_|/ |/| |
* | | Fix propertyValueSource testMartin Jones2009-09-021-7/+9
| |/ |/|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-0142-1114/+746
|\ \ | | | | | | | | | kinetic-declarativeui
| * | Rewrite of DirectFB locking mechanismAnders Bakken2009-09-019-92/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirectFB allows you to have a locked subSurface that remains valid while you paint on the unlocked "parent" surface. The only limitation is that when accessing the locked memory you might have to call DirectFB->WaitIdle() in case pending GPU operations aren't finished. After this we keep the locked surface around at all times (from the first time it's requested) until the surface dies. Previous calls to lock() will just call WaitIdle if necessary and previous calls to unlock now just mark the surface as dirty and in need of a WaitIdle if someone needs to access its pixel data. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Make DirectFB compile with Qt in a namespaceAnders Bakken2009-09-015-43/+38
| | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Add DirectFB to QScreenDriverFactoryAnders Bakken2009-09-011-2/+7
| | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Add directfb.pri to embedded.priAnders Bakken2009-09-011-0/+4
| | | | | | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Copy directfb.pro to src/gui/embedded/directfb.priAnders Bakken2009-09-012-35/+41
| | | | | | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Add directfb to CFG_GFX_AVAILABLEAnders Bakken2009-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | This is a first step in making it possible to build DirectFB as part of QtGui. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Don't check for null if never happens, but test it if it may...João Abecasis2009-09-011-4/+4
| | | | | | | | | | | | | | | | | | Making coverity happy. Reviewed-by: Olivier Goffart
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-013-14/+12
| |\ \ | | | | | | | | | | | | | | | | Conflicts: examples/qws/dbscreen/dbscreen.cpp
| | * | Fix Solaris build: test isn't test.Thiago Macieira2009-09-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | configure: test: argument expected Reviewed-by: TrustMe
generated by cgit v0.12 at 2025-08-14 07:13:34 (GMT)