summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-0233-286/+641
|\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlmetatype.cpp
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-12-0230-198/+635
| |\ | | | | | | | | | into kinetic-declarativeui
| | * Delay the creation of the signal parameter object until neededAaron Kennedy2009-12-022-12/+14
| | |
| | * Run QmlParserStatus::componentComplete() in opposite orderAaron Kennedy2009-12-021-1/+1
| | | | | | | | | | | | | | | This improves perf when a parent depends on its childrens' size.
| | * Cleanup cached binding closuresAaron Kennedy2009-12-024-14/+19
| | |
| | * Cache binding closuresAaron Kennedy2009-12-0211-16/+118
| | |
| | * CompileAaron Kennedy2009-12-021-1/+1
| | |
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-0211-29/+208
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-021-1/+4
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Allow Flickable direction to be set explicitly.Martin Jones2009-12-025-6/+62
| | | | |
| | * | | QML timing utilityAaron Kennedy2009-12-023-0/+155
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-017-5/+330
| | |\ \ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-011-60/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-12-013-8/+19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-11-302-3/+48
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of /Users/akennedy/Qt/kinetic2 into ↵Aaron Kennedy2009-11-3067-740/+1040
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2009-11-3067-740/+1040
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/animation/qabstractanimation.cpp
| | * | | | | | | | | Two way WorkerScript communicationsAaron Kennedy2009-11-309-159/+276
| | |/ / / / / / / /
| * | | | | | | | | Remove qlistmodelinterface.h duplicateMartin Jones2009-12-023-87/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Get qsTr and friends working again.Michael Brasser2009-12-011-1/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Change from scaling/zooming by zoomFactor to instead use painter scaling.Warwick Allison2009-12-026-42/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses a fixed zoomFactor of 4 to allow sufficient sub-"pixel" precision.
* | | | | | | | Compile as module.Warwick Allison2009-12-022-0/+3
| | | | | | | |
* | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-014-7/+139
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-011-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-12-0179-817/+1513
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | * | | | | | | | doc fixBea Lam2009-11-301-1/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Fix jumpy EaseFollow animationsMartin Jones2009-12-011-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5766
| * | | | | | | Add header and footer to ListView.Martin Jones2009-12-012-5/+137
| | | | | | | |
* | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-017-5/+318
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | Build correct QmlViewer Screen orientation implementation for Maemo.Martin Jones2009-12-011-1/+1
| | | | | | | |
| * | | | | | | Cleanup orientation stuff.Martin Jones2009-12-011-14/+2
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-0171-804/+1044
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | | Make focusOnPress the default behaviour for TextEdit (like TextInput).Michael Brasser2009-12-012-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Add Screen element in QmlViewr Module including orientation property.Martin Jones2009-12-015-3/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for automatic Maemo rotation update.
* | | | | | | Compile when in module.Warwick Allison2009-12-011-0/+1
| | | | | | |
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-12-011-60/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Remove accidentally added file.Michael Brasser2009-12-011-60/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Remove include styles that rely on configure.Warwick Allison2009-12-01122-298/+297
|/ / / / / | | | | | | | | | | | | | | | May help modularization (syncqt and configure are Qt-specific).
* | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-3067-740/+1040
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp
| * | | | | Fixed build on S60 and WinCEThorbjørn Lindeijer2009-11-301-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Since qreal is a float on these targets, it was having trouble picking the right version of qMax.
| * | | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-2714-67/+164
| |\ \ \ \
| | * | | | fix crash on closing all files under certain circumstancesOswald Buddenhagen2009-11-263-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after all, it is no good idea to announce the removal of all columns just to let the view headers adjust themselves - it also makes the views emit currentItemChanged() which has some undesirable side effects. so don't do it an fix the header manually.
| | * | | | ignore Alt+Space acelerators - useless and too many false positivesOswald Buddenhagen2009-11-261-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4429
| | * | | | Improved and optimized the WaveUnderlineThorbjørn Lindeijer2009-11-262-32/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WaveUnderline used to be a series of 180 degree arcs, that didn't always align very well between different text items and that could be clipped at the bottom since the font height got reduced. Now it uses quad beziers so that it is more like a sinus curve, and the alignment and clipping issues have been fixed. The painting of the WaveUnderline has been optimized using QPixmapCache. A 100 pixels wide sample of the wave is now cached as a pixmap and repeated to draw the WaveUnderline. This is an order of magnitude faster than rasterizing a QPainterPath. The QPlainTextEdit needs to set the brush origin since it draws the text items in local widget coordinates, rather than relying on a painter translation like the QTextEdit. Done with mae.
| | * | | | offer only possible countries for each languageOswald Buddenhagen2009-11-252-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise qlocale will silently clobber the user's (most probably bogus) choice anyway.
| | * | | | add qph autotestOswald Buddenhagen2009-11-252-0/+22
| | | | | |
| | * | | | make qph use language attributesOswald Buddenhagen2009-11-251-5/+18
| | | | | |
| | * | | | the definition needs xml escaping, tooOswald Buddenhagen2009-11-251-1/+1
| | | | | |
| | * | | | don't write context into <definition> fieldOswald Buddenhagen2009-11-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is really no point in doing so Reviewed-by: hjk
| | * | | | qph: don't clobber <definition> fieldsOswald Buddenhagen2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the translator comment field is not written out, so reading the definition into it is basically discarding it as far as any roundtrips which arrive at qph again are concerned. the message's disambiguation seems most suitable for the task. Reviewed-by: hjk Task-number: QTBUG-4498