summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |\ \ | | | |/
| | * | Compilation on symbianOlivier Goffart2010-02-211-3/+3
| | | |
| | * | Enable QT_USE_FAST_CONCATENATION by default for compiling QtOlivier Goffart2010-02-212-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But disable it with GCC 4.0 as it is known to cause problems due to a compiler bug Reviewed-by: Joao Reviewed-by: hjk
| | * | Compile with QT_USE_FAST_OPERATOR_PLUSOlivier Goffart2010-02-213-4/+4
| | | | | | | | | | | | | | | | Reviewed-by: Joao
| | * | QStringBuilder: Do not resize if not required.Olivier Goffart2010-02-211-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduce a lot the binary size. And is also faster. It is not source compatible if customer have made their own QConcatenable. But this class is not documented, and it is easy to fix. Reviewed-by: Joao Reviewed-by: hjk
| | * | QStringBuilder: reduce the size of the generated codeOlivier Goffart2010-02-211-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A simple concatenation of 2 string does not benefit from the QStringBuilder trick, yet, this would produce more code with QT_USE_FAST_OPERATOR_PLUS This commit specialize the QStringBuilder with two QString so it produce the same code as without it. Reviewed-by: joao Reviewed-by: hjk
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-221-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-211-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-211-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
| | | | * | QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.Daniel Molkentin2010-02-211-1/+1
| | | | | |
| * | | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-2117-553/+204
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Revert "Factored readRegistryKey implementation out of qmake" Revert "Factored epocRoot implementation out of qmake"
| | * | | | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-219-258/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. Conflicts: qmake/Makefile.unix
| | * | | | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-2113-297/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-21302-68221/+34221
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for symbian license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-20302-68221/+34221
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for symbian license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-20356-6032/+7175
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-20302-68220/+34223
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
| | * | | | | Compile fix for symbianaavit2010-02-201-5/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | Reviewed-by: trust me
| | * | | | Merge branch 'rtiff392'aavit2010-02-20170-62706/+9373
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/legal/3rdparty.qdoc
| | | * | | | license doc updated for libtiff 3.9.2aavit2010-02-161-39/+78
| | | | | | |
| | | * | | | Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| | | | | | |
| | | * | | | Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a clean copy of libtiff 3.9.2, except that contrib, tools, config and other unneeded stuff have been removed, as usual. Our configuration build modifications will follow in a separate commit.
| | | * | | | Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
| | | | | | |
| | * | | | | Merge branch 'rjpeg8'aavit2010-02-20133-5520/+24856
| | |\ \ \ \ \
| | | * | | | | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-163-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libjpeg versions >= 7, the default unit-scaling when decompressing is given as 8/8 instead of 1/1.
| | | * | | | | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is the combination of earlier Qt patches to libpng, reapplied here after the upgrade to version 8.
| | | * | | | | Add libjpeg 8aavit2010-02-16137-0/+53170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a clean copy of libjpeg , except that some build scripts, test images etc. have been removed, as usual. Our configuration modifications will follow in a separate commit.
| | | * | | | | Delete libjpeg 6baavit2010-02-1690-33896/+0
| | | | | | | |
| * | | | | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-20488-1815/+24680
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (324 commits) Assistant: Remove 'namespace qt' from new files in 4.7 Doc: these files are NOT part of the test suite of the Qt toolkit Autotest: make the licenseCheck test also check .qdoc files use egl properties when creating surfaces on symbian work around the current include file structure on Symbian^3 Get rid of the dependency on the Symbian app layer Fix incorrect license headers Fix incorrect license headers tst_qnetworkreply: Check if TCP/HTTP connection got re-used Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 Fix building in a namespace on Windows Supressed Icon sizes on QPushButton in QS60Style Ensure that posted events are sent on Windows Fixed off-by-one blending errors in the NEON drawhelper code. Fixed libstdcpp.dll version autodetection for Symbian Fixed linkage failure when building qmake on Unix platforms Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations. ...
| | * | | | | Assistant: Remove 'namespace qt' from new files in 4.7Thiago Macieira2010-02-203-6/+0
| | | | | | |
| | * | | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-20485-1809/+24680
| | |\ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (323 commits) Doc: these files are NOT part of the test suite of the Qt toolkit Autotest: make the licenseCheck test also check .qdoc files use egl properties when creating surfaces on symbian work around the current include file structure on Symbian^3 Get rid of the dependency on the Symbian app layer Fix incorrect license headers Fix incorrect license headers tst_qnetworkreply: Check if TCP/HTTP connection got re-used Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 Fix building in a namespace on Windows Supressed Icon sizes on QPushButton in QS60Style Ensure that posted events are sent on Windows Fixed off-by-one blending errors in the NEON drawhelper code. Fixed libstdcpp.dll version autodetection for Symbian Fixed linkage failure when building qmake on Unix platforms Factored epocRoot implementation out of qmake Factored readRegistryKey implementation out of qmake Cetest extensions for Windows Mobile device power operations. Remote lib extensions for Windows Mobile device power operations. ColorDialog is always shown as stripped-down version (for QVGA) ...
| | * | | | | Doc: these files are NOT part of the test suite of the Qt toolkitThiago Macieira2010-02-2046-46/+46
| | | | | | |
| | * | | | | Autotest: make the licenseCheck test also check .qdoc filesThiago Macieira2010-02-201-0/+12
| | | | | | |
| | * | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-20782-16228/+102444
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| | * | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-2056-435/+3874
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
generated by cgit v0.12 at 2025-03-23 09:47:45 (GMT)