summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use drawTiledPixmap for tiling.Michael Brasser2009-09-111-30/+6
| | | | So we can take advantage of backend optimizations.
* Fixed references to QFxPainted, which got replaced by QFxPaintedItemThorbjørn Lindeijer2009-09-102-3/+5
| | | | | | | | See commit 415708f85341448c6f30bbca6e31e48dbfde72a5, and later renaming of QFxImageItem to QFxPaintedItem in commit d1bb572b9fb5b0286df992c8ae560d91c9dc3388. Also added a table of contents to the QML for C++ Programmers page.
* Remove unused imports from examples for extending.Christian Kamm2009-09-1010-10/+0
| | | | Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* Fix QML_DEFINE_EXTENDED_TYPE use in extending/extended example.Christian Kamm2009-09-101-1/+1
| | | | Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* Fix extending examples by inserting the appropriate import.Christian Kamm2009-09-1010-0/+10
| | | | | Reviewed-by: owolff Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* Best to delete pointer before zeroing it.Martin Jones2009-09-101-1/+1
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-1011-62/+154
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-1012-38/+120
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Cursory QFxTextInput documentation.Alan Alpert2009-09-101-0/+58
| | |
| * | Update demos to work with API changesAlan Alpert2009-09-105-6/+7
| | | | | | | | | | | | Affected are flickr and twitter.
| * | API ChangesAlan Alpert2009-09-107-56/+89
| | | | | | | | | | | | Renaming stuff in TextEdit/Input
* | | Follow renamed to SpringFollow.Martin Jones2009-09-1019-115/+180
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-109-31/+92
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-109-8/+406
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Report custom parse errors verbosely.Warwick Allison2009-09-109-31/+92
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-103-7/+294
|\ \ \ \ | | |/ / | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-09-1011-63/+539
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-099-59/+248
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Start on QFxTextInput autotestsAlan Alpert2009-09-092-4/+291
| | | | | | | | | | | | | | | | | | | | Actually has tests in it now. Not all implemented yet though.
| * | | | typoYann Bodson2009-09-101-3/+3
| |/ / /
* | | | Support URL resolution from within script blocksAaron Kennedy2009-09-102-4/+25
| |/ / |/| |
* | | Autotest for property aliasesAaron Kennedy2009-09-096-1/+112
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-0924-264/+263
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0926-334/+803
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Fix more autotestsAlan Alpert2009-09-099-139/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now expect autotests to pass (as much as the rest of Qt) Tests updated: NumberFormatter PathView QBindableMap QFxText QFxTextEdit (still fails) Repeater
| * | Rename QFxItem::children() to QFxItem::fxChildren()Alan Alpert2009-09-094-8/+8
| | | | | | | | | | | | | | | | | | | | | No more accidental hiding. Differently named functions for QObject children: children() QGraphicsItem children: childItems() QFxItem children: fxChildren()
| * | Fix up some of the testsAlan Alpert2009-09-0910-114/+96
| | | | | | | | | | | | | | | | | | | | | | | | Update to work with the latest changes, like 'import Qt 4.6'. Tests affected: DateTimeFormatter Layouts (Positioners) ListView (Still not passing)
| * | Fix bug with keypad navigationAlan Alpert2009-09-091-3/+3
| | | | | | | | | | | | Navigation test now passes.
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-0926-334/+803
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-09156-2312/+2484
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Doc.Martin Jones2009-09-091-0/+2
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-09127-1910/+2079
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Move ComponentInstance functionality into LoaderMartin Jones2009-09-0923-396/+373
| | | |
| * | | Add EaseFollow elementAaron Kennedy2009-09-095-3/+493
| | | |
* | | | Don't allow sparse-setting, since not efficient anyway.Warwick Allison2009-09-091-22/+16
| | | |
* | | | clearer exampleWarwick Allison2009-09-091-4/+12
| | | |
* | | | Fix destruction of ModelNodes (fix crash-on-exit).Warwick Allison2009-09-091-7/+6
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-09-09142-1950/+2266
|\ \ \ \ | | |_|/ | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-09983-9148/+19963
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxlistview.h
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-09120-1853/+1860
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | Remove debug.Michael Brasser2009-09-091-4/+1
| | | | | |
| | | * | | Make sure animations convert between float and double when needed.Michael Brasser2009-09-091-2/+1
| | | | | |
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-08118-1847/+1858
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | | * | | Fix QDirectFBPixmapData::fromImageAnders Bakken2009-09-081-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix should optimize pixmap loading on most platforms and also fixes a bug on a certain hardware where the alpha channel of an image was not retained upon loading it. This patch also takes care of handling dithering better in QDirectFBPixmapData::fromImage(). Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | | Fixes "Out of heap space" error when compiling on some setups.Bill King2009-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original fix was for "out of stack space" due to to low a value, this one is for too high a value.
| | | | * | | Fix define in QDirectFBScreenAnders Bakken2009-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's QT_NO_DIRECTFB.*, not QT_DIRECTFB_NO.* Reviewed-by: TrustMe
| | | | * | | memset DFBWindowDescription to 0Anders Bakken2009-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes debugging easier. Reviewed-by: TrustMe
| | | | * | | Doc: A timeline's current value is not reset when the duration changes.David Boddie2009-09-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 219152 Reviewed-by: Trust Me
| | | | * | | Cleanup of QGLPaintDevice before it goes inTom Cooksey2009-09-089-430/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the last patch in the QGLPaintDevice series. Although previous patches have not been reviewed individually, Samuel's reviewed QGLPaintDevice API and all the changes as the code stands with this patch. Reviewed-by: Samuel
| | | | * | | Make QGLPixmapData work with the new QGLPaintDevice APITom Cooksey2009-09-087-85/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the ordering of QGL2PaintEngine::begin a bit because QGLPixmapData needs to use the paint engine's drawTexture method within beginPaint(). Also, this initialises needsSync to true and removes the setState call. So now all the state initialisation is done in ensureActive rather than begin.