summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reimplement MR1271 over coda patchShane Kearns2011-08-051-16/+16
| | | | | | This restores the option to upload files to arbritrary locations. Reviewed-By: mread
* Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)mread2011-08-051-1/+4
| | | | | | | | | RTz::GetTimeZoneIdL() returns a CTzId object which the client has to own. But in utcToLocal(QDate &, QTime &) it was being used anonymously and forgotten. Task-number: QTBUG-20765 Reviewed-by: Shane Kearns
* Fix bad merge on a couple of xml examplesMiikka Heikkinen2011-08-052-4/+2
| | | | Reviewed-by: mread
* DEF file freezemread2011-08-048-0/+102
| | | | Reviewed-by: Miikka Heikkinen
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-08-0413-146/+146
|\
| * runonphone: fix failure to terminateShane Kearns2011-08-021-3/+3
| | | | | | | | | | | | | | | | | | In some cases, the serial port is always completing with no error and zero bytes read. In this case, runonphone would not shut down properly as the terminate file descriptor was never read. Reviewed-By: mread
| * Fix license headers in new files from coda patchShane Kearns2011-08-028-137/+137
| |
| * runonphone: command line args improperly passed to TRK after CODA patchShane Kearns2011-08-021-1/+1
| |
| * Preventing QSoftkeyManager giving false positive memory leaksmread2011-08-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | QSoftkeyManager has a global static instance that was not being deleted on app exit. This global static instance can own other objects, the number of which grow with use up to a limit. This gives the appearance of a memory leak when the app exits and you see increasing heap cell counts. The change is to use a QScopedPointer to clean up the static on app exit. Reviewed-by: Miikka Heikkinen
| * Fixed memory leak in QMessageBox::setInformativeText in Symbianmread2011-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | The Symbian implementation of QMessageBox::setInformativeText was taking the text from a QLabel and using it in a QTextBrowser, leaving the QLabel un-parented and therefore leaking. This is fixed by setting the QMessageBox as the QLabel's parent Task-number: QTBUG-20622 Reviewed-by: Miikka Heikkinen
* | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-08-0463-321/+2272
|\ \ | |/ |/|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-08-033-23/+40
| |\ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c. Fix gamma corrected source color in GL
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-032-5/+10
| | |\ | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c.
| | | * Fixed compile error in qwindowsurface_qws.cpp.Samuel Rødal2011-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20713 Reviewed-by: Jørgen Lind
| | | * Fixed regression introduced by 5842d19cf3dff37a85c.Samuel Rødal2011-08-031-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | We need a normalized rectangle. Reviewed-by: aavit
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-011-18/+30
| | |\ \ | | | |/ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix gamma corrected source color in GL
| | | * Fix gamma corrected source color in GLJiang Jiang2011-07-291-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL_EXT_framebuffer_sRGB expects linear RGB as input color, thus we need to convert sRGB based input color into linear RGB first before using glBlendColor with it. Task-number: QTBUG-20574 Reviewed-by: Samuel Rødal
| * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-033-21/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Remove DerivedSources.pro from WebKit. Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default Detect linked fonts by name (insead of via CLinkedTypeface* Api)
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-032-0/+7
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-021-107/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove DerivedSources.pro from WebKit.
| | | | * | | Remove DerivedSources.pro from WebKit.Jocelyn Turcotte2011-08-021-107/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This .pro file gets processed by qmake while looking recursively for pro files. This may cause warnings and the file isn't necessary since derived sources have to be pre-generated before importing WebKit into src/3rdparty. Reviewed-by: Benjamin Poulain
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-022-0/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default
| | | | * | | | Support debuggable in the makefile build systemLiang Qi2011-08-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20697 Reviewed-by: Shane Kearns Reviewed-by: Miikka Heikkinen
| | | | * | | | Mark all Symbian debug binaries debuggable by defaultMiikka Heikkinen2011-08-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CODA 4.1.* cannot be used to debug binaries that do not have DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all projects by default. Adding this keyword has no impact for previous versions of CODA or TRK. Task-number: QTBUG-20669 Reviewed-by: Shane Kearns
| | * | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-08-0355-271/+2160
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-08-021-0/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QLabel documentation: add warning about sanitizing input
| | * | | | | | | QLabel documentation: add warning about sanitizing inputPeter Hartmann2011-08-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make users more aware of QLabel guessing the text format. Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-08-022-2/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Don't include qdbusvirtualobject header twice.
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-01284-29670/+42335
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (59 commits) Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Revert binary search in QTextEngine::findItem Remove a duplicate include line Save previous font engine for right bearing adjustment Symbian^3 workaround: Avoid usage of linked fonts. Make it possible to update a related table after an external update Fix compilation under OSX 10.7 or using llvm-gcc. Add test case name and drop parentheses for -datatags option. Adding QTDIR validation in tst_symbols autotest Disabled benchmarks referring to private headers. Add license header to printdatatags autotests Compile on symbian^3 Compile on Symbian^3. Added -datatags option to QTestLib Fixed failure of tst_qxmlquery::evaluateToReceiver Fix typo in QFontDialog docs Reset previousGlyph once we reached a new text item Build Qt for Symbian on Mac/gcce again ...
| | | * | | | | | | | Revert "fix QFileInfo::isSymLink() for NTFS mount points"Jiang Jiang2011-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70a434dc1c24f306805900b5ad7a45c7272702c6.
| | | * | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-296-31/+88
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix typo for ifdef QT_NO_ACCESSIBILITYFrederik Gladhorn2011-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | | | | Call QAccessible::updateAccessibility when a widget is deletedJosé Millán Soto2011-07-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1310 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | | * | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-272-2/+57
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-2622-9/+366
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-252-6/+10
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-232-2/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-227-13/+99
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-21198-9966/+275
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Don't include qdbusvirtualobject header twice.Frederik Gladhorn2011-07-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was in the public and private headers section. Reviewed-by: Thiago
| | | * | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-2063-20313/+42103
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-08-0152-269/+2148
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Make macdeployqt more robust against usage of symbolic links. Document support for Linguist on Mac. Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle. Guard macdeployqt against @rpath and @loader_path too. Fix typo. OpenVG cleanup. Include trailing space width in RTL text line width Fix the compilation error when QT_NO_PLUGIN_CHECK was set. Fixed holes in border image drawing by introducing new API. Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2. Revert "fix QFileInfo::isSymLink() for NTFS mount points" Remove debug output. Add some sound support to the uikit platform. Add flickrdemo uikit example project. Fix uikit simulator build. Get subpixel antialiasing again w/combo of raster and affine transform Add initial support for bitmap version 4/5 headers. optimize QRawFont::supportsCharacter() Switch to use floating point pixelSize in QRawFont completely Add a way to check if we have a matching family in the database.
| | * | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-291-13/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Make macdeployqt more robust against usage of symbolic links.
| | | * | | | | | | | | | | | | | | Make macdeployqt more robust against usage of symbolic links.Eike Ziller2011-07-291-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If binaries linked against Versions/Current *and* a specific version, the framework's binary would be copied twice, leading to duplicate symbols exceptions. Instead we now check for that condition and replicate the symbolic link. Reviewed-by: TrustMe
| | * | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-272-0/+118
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Document support for Linguist on Mac.
| | | * | | | | | | | | | | | | | | Document support for Linguist on Mac.Eike Ziller2011-07-272-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dragging documents on Linguist dock icon, double clicking document in Finder, and the "open" terminal command. Task-number: QTBUG-20194 Reviewed-by: Oswald Buddenhagen
| | * | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-262-26/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle. Guard macdeployqt against @rpath and @loader_path too. Fix typo.
| | | * | | | | | | | | | | | | | | Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.Eike Ziller2011-07-262-18/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed e.g. for Qt Creator, which is a bundle of plugins. Reviewed-by: TrustMe
| | | * | | | | | | | | | | | | | | Guard macdeployqt against @rpath and @loader_path too.Eike Ziller2011-07-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | | | | | | | | | | Fix typo.Eike Ziller2011-07-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
generated by cgit v0.12 at 2024-12-29 09:49:30 (GMT)