summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* (sqlite) Allow shared cache modeBill King2010-02-093-28/+40
| | | | | | | This modification is needed to allow performance optimisations necessary for QML. Reviewed-by: Warwick Allison
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-08248-2860/+298
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make generate uid3 (symbian) work on 64 bit host platform. Updated the docs for QPainter::begin/endNativePainting() Compile fix for network benchmarks. Add a pixmap modification hook to blur pixmap filter cache Delete benchmark examples (qtestlib-simple and qtwidgets). Restructure tests/benchmarks directory. Fixed QImagReader::setAutoDetectImageFormat() to work with plugins. QLineEdit: regression: read-only line edits would eat shortcuts. QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant.
| * Make generate uid3 (symbian) work on 64 bit host platform.Thomas Zander2010-02-081-1/+1
| | | | | | | | | | | | | | | | On a 64 bit system the old code used to make; UID "0xEffffffff9d8cb14". Which doesn't get accepted by the symbian tool chain ;) The patch makes this normal size hex uid3 again. Reviewed-by: Miikka Heikkinen
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bjørn Erik Nilsen2010-02-081-5/+18
| |\
| | * Updated the docs for QPainter::begin/endNativePainting()Trond Kjernåsen2010-02-081-5/+18
| | | | | | | | | | | | | | | Task-number: QTBUG-7661 Reviewed-by: Kim
| * | Compile fix for network benchmarks.Bjørn Erik Nilsen2010-02-083-3/+3
| | |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Bjørn Erik Nilsen2010-02-081-0/+1
| |\ \ | | |/
| | * Add a pixmap modification hook to blur pixmap filter cacheTom Cooksey2010-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | We probably want to kick out filtered pixmaps from the cache when the source pixmap is modified as well as just destroyed. Reviewed-By: Samuel
| * | Delete benchmark examples (qtestlib-simple and qtwidgets).Bjørn Erik Nilsen2010-02-0814-2786/+0
| | | | | | | | | | | | | | | These have no real value anymore now that we have plenty of other benchmarks. They served as examples on how to use the QBENCHMARK macro.
| * | Restructure tests/benchmarks directory.Bjørn Erik Nilsen2010-02-08222-47/+114
| |/ | | | | | | | | | | We follow the same structure as used in the src directory. This makes it easier to navigate through the jungel, especially now that we are going to add functional tests etc.
| * Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.Trond Kjernåsen2010-02-082-8/+49
| | | | | | | | | | | | | | | | Only the compiled in formats where checked when setAutoDetectImageFormat(false) was set on a QImageReader object. Task-number: QTBUG-7980 Reviewed-by: aavit
| * QLineEdit: regression: read-only line edits would eat shortcuts.Olivier Goffart2010-02-082-0/+23
| | | | | | | | | | | | | | Restore Qt 4.5 behaviour. Task-number: QTBUG-7395 Reviewed-by: Thierry
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-085-10/+89
| |\ | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem: Do not crash at exit if there is static QGraphicsItem. Make QTextCodec reentrant.
| | * QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.Olivier Goffart2010-02-082-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DataStore could have been destroyed before. Even if having static QGraphicsItem is not really supported, it is better not to crash Task-number: QTBUG-7629 Reviewed-by: bnilsen
| | * Make QTextCodec reentrant.Olivier Goffart2010-02-083-9/+85
| | | | | | | | | | | | | | | | | | | | | QTextCodec::codecForName and codedForMib were not reentrant Reviewed-by: Brad Reviewed-by: Denis
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-085-17/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Documentation: clarified RVCT support for Symbian Update Symbian OS def files for 4.6.2 Don't remove all dependencies when patching the pkg. Workaround for abld toolchain issue with s60main
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Gareth Stockwell2010-02-082-12/+40
| |\ \ \
| | * | | Update Symbian OS def files for 4.6.2Shane Kearns2010-02-082-12/+40
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8024
| * | | | Documentation: clarified RVCT support for SymbianGareth Stockwell2010-02-081-2/+3
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-8012 Reviewed-by: Iain
| * | | Don't remove all dependencies when patching the pkg.Miikka Heikkinen2010-02-081-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only remove dependencies that are known to cause unncessary warnings from pkg files when patching them with patch_capabilities.pl script. Task-number: QTBUG-8018 Reviewed-by: Janne Koskinen
| * | | Workaround for abld toolchain issue with s60mainMiikka Heikkinen2010-02-081-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for ARMV6 with abld toolchain in Symbian, qtmain.lib ends up missing some symbols that are required to link it against GCCE apps. This happens because --dllimport_runtime compiler option is missing in ARMV6 builds of qtmain.lib. Task-number: QTBUG-7952 Reviewed-by: axis
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0846-5049/+172
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove the installer from the Qt sources. Fixes qabstractslider autotest Add a recursive rule for running the auto-tests. Do not run the tests automatically during install. Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| * | Remove the installer from the Qt sources.Thiago Macieira2010-02-0830-4972/+0
| | | | | | | | | | | | | | | | | | This copy of the installer doesn't work anymore. Reviewed-By: TrustMe
| * | Fixes qabstractslider autotestDenis Dzyubenko2010-02-082-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bad merge in the QAbstractSlider::wheelEvent. Modified an autotest to follow a change in behavior - scrolling with a horizontal mouse wheel to the "right" means increasing the value. Reviewed-by: Richard Moe Gustavsen
| * | Add a recursive rule for running the auto-tests.Adrian Constantin2010-02-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Use "make check" to run all the auto-tests. Task-number: QTPROD-442 Reviewed-by: Harald Fernengel Reviewed-by: Rohan McGovern
| * | Do not run the tests automatically during install.Janne Hämäläinen2010-02-081-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | A separate "check" rule added for running the tests. Use "make check" to run the tests. Task-number: QTPROD-442 Reviewed-by: Harald Fernengel Reviewed-by: Rohan McGovern
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0813-58/+151
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0613-58/+151
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0613-58/+151
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| | | | * Fixes scrolling horizontally with a mouse wheel over sliders.Denis Dzyubenko2010-02-053-27/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scrolling horizontally over sliders the slider should go to the right, which means the value of the slider should increase. However in Qt scrolling with a mouse wheel horizontally means the delta value is negative, which is wrong. So changed the delta to be inversed. Reviewed-by: Richard Moe Gustavsen
| | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-02-056-28/+81
| | | | |\
| | | | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-056-28/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) Changes in WebKit/qt since the last update:
| | | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-02-0551-488/+1811
| | | | |\ \ | | | | | |/
| | | | | * A fix for accidently reused variable names in nested iterations.Zeno Albisser2010-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | | | | * Iain's changes for 4.6.2Iain2010-02-051-0/+8
| | | | | |
| | | | * | Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.David Boddie2010-02-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Suggested-by: Robert Griebl
| | | | * | Doc: Fixed typo.David Boddie2010-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-082-1/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabling runfast mode when vfpv2 used. Fixing a test case to be runnable on Symbian device.
| * | | | | Enabling runfast mode when vfpv2 used.Aleksandar Sasha Babic2010-02-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fpu flag is monitored and when either 'softvfp+vfpv2' or 'vfpv2' detected we are turning on RunFast mode (via --fpumode fast switch). Reviewed-by: Iain
| * | | | | Fixing a test case to be runnable on Symbian device.Aleksandar Sasha Babic2010-02-081-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Number of stacked items had to be lowered due to memory constrains. Reviewed-by: TrustMe
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-02-072-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: [CRASH] audioinput and audiooutput examples crash when no devices are
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-02-07129-578/+30579
| |\ \ \ \
| * | | | | [CRASH] audioinput and audiooutput examples crash when no devices areKurt Korbatits2010-02-072-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available. Task-number:QTBUG-7783 Reviewed-by:Justin McPherson
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-0610-120/+306
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed casual crash in initializeDb (Symbian) Fixed a bug where text would disappear in password fields. Fixed sendEvent call. Removed useless member variable and replaced with var on the stack. Fixed indentation. Fix to S60 softkey pressed down image. Whitespace/tab fixes. s60 application loses normalGeometry when returning from fullscreen Fixing 'softvfp+vfpv2' compiling issue for Tb9.2
| * | | | | Fixed casual crash in initializeDb (Symbian)Alessandro Portale2010-02-051-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic_cast should be used carefully with rvct before version 4. We found that out after the a dynamic (down)-cast from CFont* to CFbsFont* in QtGui suddenly failed. We test for (TypeUid() == KCFbsFontUid), before doing the cast. So, a static_cast is safe in this case. Also the other two dynamic_casts in qfontdatabase_s60.cpp were changed to static_cast. http://bugreports.qt.nokia.com/browse/QTBUG-7963 Task-number: QTBUG-7963 Reviewed-by: lars modified: src/gui/text/qfontdatabase_s60.cpp
| * | | | | Merge branch 'inputContextFixes' into 4.6-s60axis2010-02-052-16/+17
| |\ \ \ \ \
| | * | | | | Fixed a bug where text would disappear in password fields.axis2010-02-052-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two bugs: - First, we need to avoid triggering the CancelTransaction call when committing the temporary preedit text, because otherwise FEP starts sending us spurious backspace events. Since the "triggeredBySymbian" variable is no longer descriptive for that use case, I renamed it in the process and that changed the negation of the flag. Notice the absense of a change inside commitTemporaryPreeditString(). That is because we want that one to avoid the transaction cancel, and therefore wee keep the old negation. - Second, m_cursorPos needs to be kept in sync with the widget state when we send the temporary preedit string, because the input context cannot separate between types of preedit text when it hits the first block in commitCurrentString() (types being either our temporary text, or FEP's text), and we have to avoid the longPress code path. RevBy: Janne Koskinen
| | * | | | | Fixed sendEvent call.axis2010-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation states we should use the local sendEvent. Not sure if it makes a difference, but better to be consistent. RevBy: Trust me
| | * | | | | Removed useless member variable and replaced with var on the stack.axis2010-02-052-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | | Fixed indentation.axis2010-02-051-1/+1
| | | | | | |
generated by cgit v0.12 at 2025-04-12 10:56:04 (GMT)