summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-04-278-13/+191
|\
| * Fix BlendBench::unalignedBlendArgb32 test caseMiikka Heikkinen2011-04-271-2/+2
| | | | | | | | | | | | | | The test case freed the wrong pointer, causing crash in Symbian devices. Task-number: QTBUG-17489 Reviewed-by: Janne Koskinen
| * Added autotest for threaded text rendering.Laszlo Agocs2011-04-261-0/+41
| | | | | | | | | | Task-number: QTBUG-18516 Reviewed-by: TRUSTME
| * Implement support for enable_backup CONFIG value.Miikka Heikkinen2011-04-263-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | The enable_backup CONFIG value can be used to generate deployment for backup registration file for an application. BACKUP_REGISTRATION_FILE_SYMBIAN and BACKUP_REGISTRATION_FILE_MAEMO variables can be used to specify a custom backup registration files. Only works on Symbian and Maemo platforms. Task-number: QTBUG-17214 Reviewed-by: Oswald Buddenhagen
| * Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-04-263-11/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | It was previously not possible to render text (QPainter::drawText) in a secondary thread on Symbian, it always resulted in some kind of panic. This patch corrects it. For S60 5.0 and earlier the behavior is not changed, threaded text rendering is only supported on Symbian^3 and newer. This also means QFontDatabase::supportsThreadedFontRendering() will return true from now on, but only on Symbian^3 and higher. Task-number: QTBUG-18516 Reviewed-by: mread
* | Fix memory leak in XSD component of XmlPatternsHonglei Zhang2011-04-2710-25/+25
|/ | | | | | | | | | | | There are couple of memory leaks in XmlPatterns when parsing XSD files. The reason is that the module over uses the shared data pointer and generates many cyclic reference loop. Some part of the code is refactored. Instead of using shared data pointer, normal C++ pointer is used to break the ownership loop. This is bug fix for QTBUG-8948. Task-number: QTBUG-8948 Reviewed-by: Sami Merila and Laszlo Agocs
* Fix autotest failure in XmlPattern qxmlqueryHonglei Zhang2011-04-201-2/+2
| | | | | | | | | The bug fix for the memory leak in qxmlquery tried to fix a memory leak in autotest test driver. The fix broke the autotest logic and causes failure. This one fix the commit 986ab48f112... Task-number: QTBUG-15191 Reviewed-by: Sami Merila
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-04-193-2/+15
|\
| * Symbian's QElapsedTimer::restart() fixed to return ms rather than usmread2011-04-191-1/+1
| | | | | | | | | | | | | | | | Symbian's QElapsedTimer::restart() had accidently been changed to return a microsecond count rather than milliseconds, when the elapsed timer resolution was increased. This fixes it back to milliseconds. Reviewed-by: Shane Kearns
| * Create a cleanup stack for each new thread on Symbian.Laszlo Agocs2011-04-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The native thread implementation in Qt 4.8 did not call CTrapCleanup::New() which resulted in E32USER-CBASE 69 panics in applications when they tried to use the cleanup stack in a thread's run() function. In 4.7 this was working because OpenC's pthread implementation created a CTrapCleanup automatically. Now we do it also in the native Symbian thread implementation. Trask-number: QTBUG-18822 Reviewed-by: Murray Read
| * Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-04-181-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimum sizes of widgets can cause windows to expand beyond screen limits in QWidgetPrivate::setGeometry_sys. Normally this is not noticeable as the window size is forced in various places to the clientRect, but there are certain sequences where the size set in setGeometry_sys is the final one, resulting in too large windows. Removed the modification of window size in setGeometry_sys for fullscreen windows for which the correct size is already requested. Task-number: QTBUG-18749 Reviewed-by: Sami Merila
* | Fix memory leak bugs in XmlPatternsHonglei Zhang2011-04-1910-10/+20
|/ | | | | | | | | | In XmlPatterns implementation, QExplicitlySharedDataPointer and QSharedData classes are widely used. The over use of these classes has cuased couple of cyclic references. Some codes are refactored to use plain C++ pointer to break the reference loop. Task-number: QTBUG-15191 Reviewed-by: Laszlo Agocs and Sami Merila
* Fixed Qt UDA creation for SymbianTomi Vihria2011-04-142-1/+2
| | | | | | | | | | Added a dummy Qt sis file and fixed paths in bld.inf. Otherwise build would fail when FF_QT_IN_UDA is defined. Dummy Qt sis file needs to replaced with a real one when actual UDA image is created. Task-number: QT-4888 Reviewed-by: Guoqing Zhang
* Enablers for the Qt eclipsing in SymbianTomi Vihria2011-04-143-55/+4
| | | | | | | | | Remove file listing from the stub package file to ease maintenance, generate stub sis from it and export it to the correct location to be included into ROM. Task-number: QT-4817 Reviewed-by: Guoqing Zhang
* Improve logic to find default certificates in createpackage scriptMiikka Heikkinen2011-04-131-4/+10
| | | | | | | | | | | | | | | Original implementation assumed createpackage script was always run from under Qt source tree bin directory, which is not always the case as on some platforms the Qt tools can be found from under EPOCROOT. Fixed it so that if the default directory for default certificates can't be found in the expected location, createpackage will attempt to query qmake in the same directory as the createpackage script for the location of the Qt source tree (QT_INSTALL_PREFIX) and look for default certificates directory from under there. Task-number: QTBUG-18684 Reviewed-by: Janne Koskinen
* Fix "make sis" for projects that have empty OBJECTS_DIRMiikka Heikkinen2011-04-121-1/+5
| | | | | | | Temp directory for packagaging got created to system root if OBJECTS_DIR was empty. Fixed it to use '.' instead in those cases. Reviewed-by: Janne Koskinen
* Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-123-54/+153
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-123-54/+153
| |\ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Update XCreateWindow in qgl_X11egl.cpp Lancelot: support for custom keys added to protocol. API cleanup.
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-stagingaavit2011-04-121-1/+9
| | |\
| | | * Update XCreateWindow in qgl_X11egl.cppJuanZhao2011-04-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | XCreateWindow should provide mask and colormap, or this may load XCreateWindow error in the server side. Merge-request: 1183 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-11769-2666/+49718
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (119 commits) Lancelot: support for custom keys added to protocol. API cleanup. Designer: Allow promoted QWidget's to be buddies. Designer: Specify 'notr' attribute for buttongroup name. [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource Let's not write to the source buffer when blending argb32 on rgb16. Add support for -unset <prop> option to qmake. make -markuntranslated work without -idbased fix conditional on shell type Cocoa: p1 bug fix: fix auto test regressions Ensure shared network session deleted from correct thread Revert "Remove SIGBUS emission from QNetworkSession destruction." Image w/ PreserveAspectFit has its width changed once more than needed. fix QLocalSocket::isValid() on Windows Cocoa: p1 bug fix: revert use of subWindowStacking Not possible to enter negative values to widgets with numeric fields QmlViewer: Enable remote qml debugging QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug Fix typos in QSharedPointer documentation. Improve Flickable dynamics and allow platform specific tweaking. ...
| | | * Lancelot: support for custom keys added to protocol. API cleanup.aavit2011-04-112-53/+144
| | | |
* | | | Merge remote-tracking branch 'qt/master'Sami Lempinen2011-04-125-169/+179
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-04-115-170/+180
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Updated QtOpenGL DEF file Updated QtOpenVG DEF file Updated QtGui DEF file for ARMV5 Updated DEF files
| | * \ \ Merge remote-tracking branch 'qt-releng-team/master'Eckhart Koppen2011-04-11902-11954/+53355
| | |\ \ \
| | | * | | Updated QtOpenGL DEF fileEckhart Koppen2011-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absented missig functions Reviewed-by: TrustMe
| | | * | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-08871-11658/+51823
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def
| | | * | | | Updated QtOpenVG DEF fileEckhart Koppen2011-04-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new functions and absented missing functions Reviewed-by: TrustMe
| | | * | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-0632-294/+1528
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-05820-77589/+55210
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (260 commits) Add branch prediction macros Add methods for traversing and combining QProcessEnvironment. Designer [Qt Creator integration]: Fix integrated property editor. Remove obsolete patch file Fix animation tests after merge Compilation fix for WinCE Handle the HTTP 418 reply properly in QNAM Fix compilation of libtiff with zlib 1.2.5 Make sure we don't use subpixel positions in full hinting mode Fixed underline offset after raster coordinate system change. QGLContext on EGL gets an additional QEglProperties static field applied to every window surface created. Remove duplicated test. Actually do use the properties parameter in ::createSurface for x11egl. Modified pvrqwswsegl.c to make PowerVR work for processors using flipbuffer chain Check that pixmap is not null before accessing it Add missing test file. Changing width of RTL positioner doesn't relayout Fix TextInput auto test failure on mac. PinchArea and Flickable don't work well enough together Do not set focus unnecessarily at window activation in Symbian ...
| | | * | | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-05820-77589/+55210
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtOpenVGu.def
| | * | \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-041-0/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Updated QtGui DEF file for ARMV5
| | | * | | | | | Updated QtGui DEF file for ARMV5Eckhart Koppen2011-04-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing functions Reviewed-by: TrustMe
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-01203-1099/+76879
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (124 commits) Updated DEF files opengl2: Make maximum cached glyph size configurable QWS: fix the software/hardware cursor switcher Fix horizontal centered text drawing without word wrap Remove Font Smoothing hack for OS X Revert "Fixed underline offset after raster coordinate system change." Fix the painting for widgets painting directly on screen. Unix configure: Add support for --sysroot Add a 'capabilities' flag to the marshaller and demarshaller Add a set of connection capabilities to QDBusConnection Move the main D-Bus session and system connections to the main thread Add a way to obtain the DBusConnection* pointer from a QDBusConnection Make the QIconvCodec on Unix not enforce the Latin1 codec. Fixed bad merges in GL windowsurface and get rid of redundant variable. Added WindowSurfaceFeature enum to QWindowSurface. Added preserved contents property to QWindowSurface. Fixed underline offset after raster coordinate system change. Designer: Fix tab order in action editor dialog. Fix crash and infinite recursion caused by previous commits tst_qlocale: improve failure message in tst_QLocale::macDefaultLocale ...
| | | * | | | | | Updated DEF filesEckhart Koppen2011-04-016-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absented missing functions Reviewed-by: TrustMe
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-04-114-51/+38
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Remove workaround and fix properly Optimize loc.prf for localization Remove obsolete files from qt.iby
| | * | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-11906-11772/+52069
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/qt.iby
| | * | | | | | | Merge remote-tracking branch 'qt-symbian-review/master'Sami Lempinen2011-04-088-66/+45
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-04-071-10/+2
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Remove workaround and fix properly
| | | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-04-065-30/+43
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Optimize loc.prf for localization Fixed deployment problems with MSVC 2005 and 2008 SP1 QLocalSocket/Win: handle ERROR_ACCESS_DENIED
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-04-051232-81069/+144252
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (537 commits) Add branch prediction macros Add methods for traversing and combining QProcessEnvironment. Designer [Qt Creator integration]: Fix integrated property editor. Remove obsolete patch file Fix animation tests after merge Compilation fix for WinCE Handle the HTTP 418 reply properly in QNAM Fix compilation of libtiff with zlib 1.2.5 Make sure we don't use subpixel positions in full hinting mode Fixed underline offset after raster coordinate system change. QGLContext on EGL gets an additional QEglProperties static field applied to every window surface created. Remove duplicated test. Actually do use the properties parameter in ::createSurface for x11egl. Modified pvrqwswsegl.c to make PowerVR work for processors using flipbuffer chain Check that pixmap is not null before accessing it Add missing test file. Changing width of RTL positioner doesn't relayout Fix TextInput auto test failure on mac. PinchArea and Flickable don't work well enough together Do not set focus unnecessarily at window activation in Symbian ...
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-04-042-26/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Remove obsolete files from qt.iby
| | * | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-stagingSami Lempinen2011-04-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/master'Sami Lempinen2011-04-051232-81069/+144252
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | / / / / | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | Add focus frame support in style sheetGuoqing Zhang2011-04-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16027 Reviewed-by: Olivier Goffart
* | | | | | | | | | | | | | Fix OpenGL build break on SymbianGuoqing Zhang2011-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4871 Reviewed-by: Dmitry Trofimov
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamGuoqing Zhang2011-04-114-51/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | / / / / / / | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | Conflicts: src/s60installs/qt.iby
| * | | | | | | | | | | | Remove workaround and fix properlySami Merila2011-04-071-10/+2
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workaround for 3.1 can now completely removed, since support for 3.x was dropped. Task-number: QTBUG-4565 Reviewed-by: Miikka Heikkinen
| * | | | | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-063-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Optimize loc.prf for localizationGuoqing Zhang2011-04-052-28/+36
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Miikka Heikkinen