summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Making the hybrid allocator change compatible across all 4.7.x"mread2010-10-122-89/+1
| | | | | | | | This reverts commit c27f1586d7c4c56af1f46fa09ad77f03b7736e5d. The change to make the hybrid allocator change compatible across all 4.7.x releases is not needed after 4.7. The exported function added for the hybrid allocator will always be present now.
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-116-15/+117
|\ | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Making the hybrid allocator change compatible across all 4.7.x Spectrum demo: only use --rpath for linux-g++* mkspecs Spectrum demo: put binaries into correct locations on Windows Designer: Fix a crash when copying empty page-based containers.
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-115-10/+105
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-115-10/+105
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Making the hybrid allocator change compatible across all 4.7.x Spectrum demo: only use --rpath for linux-g++* mkspecs Spectrum demo: put binaries into correct locations on Windows
| | | * Making the hybrid allocator change compatible across all 4.7.xmread2010-10-112-1/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hybrid allocator introduced a new export to qtcore.dll and made all apps link to it when they linked with the corresponding qtmain.lib. However, this made all apps depend on this new export, and since that export is not present in early 4.7.x release, these apps would not run with the Qt DLLs from those releases, which breaks Qt's compatibility guarantees for patch releases. This change makes apps compatible with all 4.7.x releases again. For export frozen Qt builds (the sort that should be compatible across all 4.7.x releases), qtmain.lib no longer forces a static import link to qt_symbian_SetupThreadHeap(). Instead it dynamically loads qtcore.dll, looks up qt_symbian_SetupThreadHeap(), and calls it if present. If the function is not present, or on emulator builds where we know that qtcore will use the system allocator creation function, we call the system allocator creation function. For export unfrozen builds, there is no compatibility between builds or releases, so we do use a static import link to qt_symbian_SetupThreadHeap(), as we have to use the qtcore dll we have built with it anyway. This has been tested as follows: S60 3.1 SDK, def files not frozen. App compiled against latest code runs on the corresponding DLLs, and does not start with 4.7.0, which is what we expect. S60 3.2 SDK, def files frozen. App compiled against latest code runs on the corresponding DLLs with the new allocator, and runs on 4.7.0 DLLs with the old allocator. Which demonstrates compatibility. S60 5.0 SDK, def files not frozen, debug build. Same result as for the 3.1 SDK, which demonstrates debug build working too (all other tests are release build tests). S60 5.0 SDK, def files frozen, debug build. Same result as on S60 3.2 SDK, which demonstrates debug build working with def files. Symbian^3 SDK, def files frozen. Same result as on S60 3.2 SDK, demonstrating Symbian^3 compatibility. Symbian^4, code and tests compile and does not affect running. *** This change is only required for 4.7. It is not needed for 4.8+ *** *** If this change appears in 4.8+, it can be reverted. *** Task-number: QT-4080 Reviewed-by: Shane Kearns
| | | * Spectrum demo: only use --rpath for linux-g++* mkspecsGareth Stockwell2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13940 Reviewed-by: Martin Pejcoch
| | | * Spectrum demo: put binaries into correct locations on WindowsGareth Stockwell2010-10-113-8/+15
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13483 Reviewed-by: Miikka Heikkinen
| * | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-111-5/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Designer: Fix a crash when copying empty page-based containers.
| | * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-111-5/+12
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-111-5/+12
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Fix a crash when copying empty page-based containers.
| | | | * Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-14208
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-112-3/+43
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: The completer in an itemview would not be activated right away
| * | | | The completer in an itemview would not be activated right awayThierry Bastian2010-10-112-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have set the edit triggers to AnyKeyPressed and you press a key the completer would not kick in because the key event would come before the lineedit gets focus. The completer is only active when the lineedit has focus. Task-number: QTBUG14363 Reviewed-by: ogoffart
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-112-9/+43
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add some tests for Indic shaping in Harfbuzz Fix several errors with shaping of Indic scripts
| * | | Add some tests for Indic shaping in HarfbuzzEskil Abrahamsen Blomfeldt2010-10-111-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were added to confirm the behavior in merge request 2484. Their validity depends on the validity of the merge request. Task-number: QTBUG-13620, QTBUG-13616, QTBUG-13542
| * | | Fix several errors with shaping of Indic scriptsप्रविण सातपुते2010-10-111-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The opentype init feature was applied to some characters even when the character appeared inside a word. 2. Using the ZWJ to separate Ra and Halant Ya should connect the two latter characters and form a Yaphala 3. Some Oriya chars were not correctly marked as below-base form. Task-number: QTBUG-13620, QTBUG-13616, QTBUG-13542 Merge-request: 2484 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-1118-15/+460
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Remove references of Experimental support of the unified toolbar with
| * | | Remove references ofFabien Freling2010-10-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | qunifiedtoolbarcontainer_mac_p.h Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0918-15/+461
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Experimental support of the unified toolbar with
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0918-15/+461
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Experimental support of the unified toolbar with
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0918-15/+461
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Experimental support of the unified toolbar with
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0818-15/+461
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Experimental support of the unified toolbar with
| | | | * | | Experimental support of the unified toolbar withFabien Freling2010-10-0818-15/+461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the raster engine on Mac OS X. Task-number: QTBUG-12615 Reviewed-by: Samuel Rødal
* | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-094-7/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Add missing data for the autotest of in-place conversion for Pixmap Avoid in-place convertion of images with multiple references Fix infinite loop when justifying undisplayable Arabic text
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-094-7/+26
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-094-7/+26
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add missing data for the autotest of in-place conversion for Pixmap Avoid in-place convertion of images with multiple references Fix infinite loop when justifying undisplayable Arabic text
| | | * | | | Add missing data for the autotest of in-place conversion for PixmapBenjamin Poulain2010-10-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b uses an new image which was not commited with the patch.
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-093-7/+26
| | | |\ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Avoid in-place convertion of images with multiple references Fix infinite loop when justifying undisplayable Arabic text
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-083-7/+26
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Avoid in-place convertion of images with multiple references Fix infinite loop when justifying undisplayable Arabic text
| | | | * | | | Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-082-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decoding from image reader was assuming the image reader do not keep the image internally. This is not true for the GIF plugins because the previous image can be used to compose the current image. This was causing crash on ARM because the 16 bits color depth causes the image memory to be reduce by half. When the plugin was accessing the memory, it assumes the images has not changed and is on 32 bits. This patch disable the in-place conversion if a detach is required. Regular conversion is the correct solution in this case, and it can also be made faster by converting while copying. Reviewed-by: Andreas Kling
| | | | * | | | Fix infinite loop when justifying undisplayable Arabic textEskil Abrahamsen Blomfeldt2010-10-081-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the Arabic text is for some reason undisplayable, e.g. because of QTBUG-13132, the font engine will be unable to find the tatweel character and the kashida width may be returned as 0. This would potentially cause an infinite loop, as "need" would remain >= minKashida forever because x - 0 is still >= 0. Task-number: QTBUG-13130 Reviewed-by: Lars
* | | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-091-3/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Account for native child widgets when handling focus events
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-091-3/+4
| |\ \ \ \ \ \ |/ / / / / / / | | _ / / / / | | / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-088-19/+54
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Account for native child widgets when handling focus events Added support for using inputMethodHints in QInputDialog edit widget. Fixed some preprocessor parameters for Mac support. Fixed missing QMAKE_MOC definition in certain mkspecs.
| | * | | | Account for native child widgets when handling focus eventsGareth Stockwell2010-10-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code previously contained an implicit assumption that the control which received the FocusChanged event was a top-level widget. This meant that focus events delivered to native child widgets could cause unexpected changes in visibility of the statusbar and CBA. Task-number: QTBUG-13761 Reviewed-by: Jason Barron
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-081-4/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-081-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QGradientCache: Optimize choosing of which gradient to evict from cache
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-081-2/+2
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QGradientCache: Optimize choosing of which gradient to evict from cache
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-081-2/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QGradientCache: Optimize choosing of which gradient to evict from cache
| | * | | | QGradientCache: Optimize choosing of which gradient to evict from cacheAndreas Kling2010-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use iterator arithmetic instead of QMultiHash::keys() to remove a random gradient color table from the cache. Reviewed-by: Samuel Rødal
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-08220-446/+535
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Extended the convenience functions for QInputDialog for IM hints. Added support for using inputMethodHints in QInputDialog edit widget. Fixed some preprocessor parameters for Mac support. Fixed missing QMAKE_MOC definition in certain mkspecs. Align .pro with qmake: s/\.sources/.files/. Inconsistency with deployment keyword .sources and .files. Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.
| * | | | | Extended the convenience functions for QInputDialog for IM hints.axis2010-10-082-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Input method hints make a lot of sense when requesting specific information from the user, such as for example a URL. Therefore we include input method hints in the static convenience function. To maintain BC we need to keep the old symbol around, so a new function was added. To maintain SC, there cannot be any ambiguities when deciding which function to link to, therefore the function with the fewest arguments get to keep all the default arguments, whereas the new function gets a new explicit argument. AutoTest: Passed Task: QTBUG-13200 RevBy: Denis Dzyubenko
| * | | | | Merge branch '4.7-s60' into master-s60axis2010-10-088-21/+55
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp
| | * | | | Added support for using inputMethodHints in QInputDialog edit widget.axis2010-10-084-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AutoTest: Included Task: QTBUG-13200 RevBy: Denis Dzyubenko
| | * | | | Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Liang Qi
| | * | | | Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed the use of DIR_SEPARATOR. It does not get defined until after symbian.conf has finished parsing. RevBy: Miikka Heikkinen
| | * | | Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.Jason Barron2010-10-081-4/+5
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the cases where an error occured while converting a QPixmap to a VGImage this function would return without deleting the RSgImage pointer that it created. Fix is to use a QScopedPointer instead. Also don't use q_check_ptr() since this isn't a CBase derived class. In case you are wondering why I didn't use a custom deleter here so that Close() was also called, we need to make sure that Close() is called on the RSgImage instance before calling Close() on the driver. Reviewed-by: mread
| * | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-08206-403/+405
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
| * | | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-086-17/+23
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DEPLOYMENT instruction uses .sources, while INSTALLS uses .files. This is inconsistent, and we fix it in Qt 4 by adding .files as a supported alternative for DEPLOYMENT. This commit will be followed by a second, which aligns Qt build system. For Qt 5, this needs to be cleaned up by removing support for .sources. Task-number: QTBUG-3216 Reviewed-by: João Abecasis Cherry-picked from 730a5d562fcb7be6428458962456033054f99e4c by Frans Englich. Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-088-58/+90
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix crash when using Q_GLOBAL_STATIC(QWidget...) Removed the need for S60main.rsc resource file in Symbian.
generated by cgit v0.12 at 2025-09-09 21:40:46 (GMT)