summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add private qt_draw_glyphs() APIEskil Abrahamsen Blomfeldt2010-02-235-2/+70
| | | | | | | | | | | | | | | | | In some use cases where you use an external font engine and want to use Qt's font engine for painting, you might need a function which will give you direct access to the underlying font. A generic API for this requires a lot of API changes, so in the meantime, we implement an internal, specialized API to support the use cases where it is required. The API is considered internal and experimental, and not guaranteed to be stable or even exist across releases. This is API which provides several fun ways to shoot yourself in the foot, but if used properly, it will allow you to paint glyph ids at precalculated positions. Task-number: QTBUG-7844 Reviewed-by: Trond
* improve sql support for mingw64Thierry Bastian2010-02-232-1/+7
|
* improve 64 bit support on windowsThierry Bastian2010-02-232-2/+2
|
* Made the qDrawPixmaps() API public (with modifications).Trond Kjernåsen2010-02-2312-199/+376
| | | | | | | | | QPainter has now gotten a drawPixmapFragments() function together with a Fragment class that describes how each pixmap fragment is supposed to be drawn. Reviewed-by: Gunnar Reviewed-by: Samuel
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-23297-2778/+2542
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-2333-111/+190
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSortFilterProxyModel: Sorting occured unnecessarily when the dynamicSortFilter is turned off Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled. Fix build with wingw Imporve win64 support for mingw Compile Fix a memory hole in QGraphicsItemPrivate. Fix assert in fontengine when using rotated/scaled QStaticText Compilation fix for Symbian Compilation fix for AIX Fix build on Mac OS X Fix compilation Fix compilation on Windows Copy useBackendOptimization setting when QStaticText is detached Compilation on symbian Enable QT_USE_FAST_CONCATENATION by default for compiling Qt Compile with QT_USE_FAST_OPERATOR_PLUS QStringBuilder: Do not resize if not required. QStringBuilder: reduce the size of the generated code
| | * QSortFilterProxyModel: Sorting occured unnecessarily when the ↵Olivier Goffart2010-02-222-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamicSortFilter is turned off We should not sort when inserting items if the dinamicSortFilter flag is set to false. Note that some of the test used to rely on the fact that it was sorted. Those test have been fixed. The patch has been contributed to us in the task. Task-number: QTBUG-7716 Reviewed-by: Thierry
| | * Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled.Olivier Goffart2010-02-221-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | On GCC 4.0 we disabled the possibility to use the fast operator plus as a bug in the compiler makes it impossible to add enums. There is no normal operator+ for these case. Always test the operator% instead. Reviewed-by: joao
| | * Fix build with wingwThierry Bastian2010-02-222-6/+6
| | | | | | | | | | | | Reviewed-by: ogoffart
| | * Imporve win64 support for mingwThierry Bastian2010-02-2213-68/+61
| | | | | | | | | | | | Reviewed-by: ogoffart
| | * CompilePaul Olav Tvete2010-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | This test no longer uses QtOpenGL, therefore it doesn't need to try to link with it. Reviewed-by: Eskil
| | * Fix a memory hole in QGraphicsItemPrivate.Alexis Menard2010-02-221-5/+6
| | | | | | | | | | | | Reviewed-by:bnilsen
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-23277-2687/+2419
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Make uncached text painting work for richtext too. Updated based on change to transformOrign Documentation Update Doc fix Remove race condition in remote pixmap cancelling. Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
| | * | Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| | | |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-225-0/+5
| | |\ \
| | | * | Updated based on change to transformOrignNigel Hietala2010-02-225-0/+5
| | | | |
| | * | | Documentation UpdateAlan Alpert2010-02-221-1/+5
| | |/ / | | | | | | | | | | | | | | | | Mention that the same game tutorial is now slightly different to the demo version.
| | * | Doc fixAlan Alpert2010-02-221-1/+1
| | | |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-22947-72470/+61700
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-22268-2665/+2384
| | | |\ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
| | | * | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-22113-2218/+1931
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
| | * | | Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
| | |/ /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-221-0/+5
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-2210-93/+83
| | | |\ \
| | | * | | Update QmlChanges with animation API changes.Michael Brasser2010-02-221-0/+5
| | | | | |
| | * | | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-22144-307/+310
| | | |/ / | | |/| |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2217-90/+89
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-2212-47/+55
| | | |\ \ \ | | | | |/ /
| | | | * | Increase durations when testing Behaviors.Michael Brasser2010-02-2210-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | This should make the tests at least somewhat more reliable.
| | | * | | Fix compile error on SolarisAaron Kennedy2010-02-227-66/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-8267. Remove templating from QmlTimeLineEvent class (and rename it to QmlTimeLineCallback to more represent what it is).
| | * | | | Document the default velocity of EaseFollowMartin Jones2010-02-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8181
| | * | | | Remove use of unexprted private classes.Martin Jones2010-02-222-26/+8
| | | |/ / | | |/| |
| | * | | Add cached path rounded rect painting benchmark.Martin Jones2010-02-221-0/+24
| | | | |
| | * | | Remove use of direct event posting. Use QTest::keyClick() for keys.Martin Jones2010-02-221-23/+7
| | |/ /
* | | | Fix GL viewports under -graphicssystem raster.Gunnar Sletta2010-02-231-2/+3
| |_|/ |/| | | | | | | | | | | | | | GL widgets and native controls have paintonscreen set and bypasses backingstore. They can thus not rely on the windowsurface flushing but must be repainted via normal means
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-2216-29/+161
|\ \ \
| * | | Compilation fix for Symbianaavit2010-02-221-1/+3
| | | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-2212-17/+58
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compilation fix for AIX Fix build on Mac OS X Fix compilation Fix compilation on Windows Copy useBackendOptimization setting when QStaticText is detached Compilation on symbian Enable QT_USE_FAST_CONCATENATION by default for compiling Qt Compile with QT_USE_FAST_OPERATOR_PLUS QStringBuilder: Do not resize if not required. QStringBuilder: reduce the size of the generated code
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-221-1/+1
| | |\ \
| | * | | Compilation fix for AIXaavit2010-02-221-1/+1
| | | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2214-27/+157
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Documentation fixes. Add a qRegisterQmlElements function to QtMultimedia
| | * | | | Documentation fixes.Justin McPherson2010-02-227-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Nicholas Young
| | * | | | Add a qRegisterQmlElements function to QtMultimediaJustin McPherson2010-02-227-9/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid exposing private classes. Reviewed-by: Bill King
* | | | | | Fix assert in fontengine when using rotated/scaled QStaticTextGunnar Sletta2010-02-221-3/+7
| |_|_|/ / |/| | | | | | | | | | | | | | Reviewed-By: Eskil
* | | | | Fix build on Mac OS XGabriel de Dietrich2010-02-221-1/+1
| |_|/ / |/| | | | | | | | | | | Reviewed-by: Olivier
* | | | Fix compilationOlivier Goffart2010-02-221-1/+1
| | | | | | | | | | | | | | | | With the QT_USE_OPERATOR_PLUS, we need to cast before converting to QVariant
* | | | Fix compilation on WindowsOlivier Goffart2010-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, the MSVC compiler choose the operator+(const QString &, const QString &) instead of operator+(const WebCore::String &, const WebCore::String &) resulting in errors when QT_USE_FAST_OPERATOR_PLUS is used Reviewed-by: Jocelyn Turcotte
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-221805-77748/+127519
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-227-12/+53
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compilation on symbian Enable QT_USE_FAST_CONCATENATION by default for compiling Qt Compile with QT_USE_FAST_OPERATOR_PLUS QStringBuilder: Do not resize if not required. QStringBuilder: reduce the size of the generated code
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtRhys Weatherley2010-02-2117-553/+204
| | |\ \ \ | | | |/ /