summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-05-0537-109/+270
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix BlendBench::unalignedBlendArgb32 test case Fix memory leak in XSD component of XmlPatterns Added autotest for threaded text rendering. Implement support for enable_backup CONFIG value. Make text rendering working outside the gui thread on Symbian. Fix autotest failure in XmlPattern qxmlquery Fix memory leak bugs in XmlPatterns Symbian's QElapsedTimer::restart() fixed to return ms rather than us Create a cleanup stack for each new thread on Symbian. Do not modify window size for fullscreen windows in setGeometry_sys Fixed Qt UDA creation for Symbian Enablers for the Qt eclipsing in Symbian Improve logic to find default certificates in createpackage script Fix "make sis" for projects that have empty OBJECTS_DIR Add focus frame support in style sheet Fix OpenGL build break on Symbian
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-04-28693-14381/+62797
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (616 commits) Specify swap behavior preserved bit in openvg engine. Ignore changes to selectByMouse during a selection. PathView offset out of sync with currentIndex when items are removed. Move the TextInput cursor delegate when the preedit position changes. Fix warning about ASCII cast in calling QString::contains Fix warnings on unused parameters and variables Add new exported symbol to QtGuiu.def Input method hints are not correct if using proxy widget Cleaned up benchmark project files. Fix for GL graphcics system orientation which Update Symbian platform notes documentation Set QPixmapCache default limit to 10MB on Symbian. Use binary search to speed up findChildFrame() Document section behavior when not ordered by section Fix TextInput cursor position unchanged when selection length is 0. Fix TextInput echoMode clearing inputMethodHints set by the user. Elide has unexpected effect on Text's implicitWidth remove exec bit ... again ... Add Korean translation QDeclarativeDebug: Fix typo in warning ...
| | * Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-04-28693-14381/+62797
| | |\
| * | \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-04-2718-38/+216
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix BlendBench::unalignedBlendArgb32 test case Fix memory leak in XSD component of XmlPatterns Added autotest for threaded text rendering. Implement support for enable_backup CONFIG value. Make text rendering working outside the gui thread on Symbian.
| | * | 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
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-04-2028-295/+394
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix autotest failure in XmlPattern qxmlquery Fix memory leak bugs in XmlPatterns Symbian's QElapsedTimer::restart() fixed to return ms rather than us Create a cleanup stack for each new thread on Symbian. Do not modify window size for fullscreen windows in setGeometry_sys Fixed Qt UDA creation for Symbian Enablers for the Qt eclipsing in Symbian Improve logic to find default certificates in createpackage script Fix "make sis" for projects that have empty OBJECTS_DIR Add focus frame support in style sheet Fix OpenGL build break on Symbian Update XCreateWindow in qgl_X11egl.cpp Lancelot: support for custom keys added to protocol. API cleanup. Updated QtOpenGL DEF file Updated QtOpenVG DEF file Updated QtGui DEF file for ARMV5 Updated DEF files
| | * | 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 remote-tracking branch 'qt/master'Sami Lempinen2011-04-125-169/+179
| | |\ \ \
| | * | | | 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 git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-04-11906-11772/+52069
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (139 commits) 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 Lancelot: bail out if rendering consistently fails Minor optimization to lance/elot Make it possible to test the new font hinting in lance[elot] Cocoa: p1 bug fix: fix auto test regressions Ensure shared network session deleted from correct thread Fixes: The "test: too many arguments" error after every make 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 ...
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamGuoqing Zhang2011-04-114-51/+38
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/qt.iby
* | | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-0423-141/+463
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QmlViewer: Translate UI Fix insert and scroll to bottom case QDeclarativeDebug: Fix test case QDeclarativeDebug: Handle case where client with ongoing queries is deleted Remove compile warning Fix QUnifiedTimer bug Stop the animation driver when there are no more animations. Optimization and benchmark for setting object properties from QML. Add Constant and Final flags to QMetaObjectBuilder Fixed QML TextEdit docs Make -no-opengl exist on other platforms Only ask for name when the user goes on the high score list.
| * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-0210-126/+166
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: QmlViewer: Translate UI Fix insert and scroll to bottom case
| | * | | | | | | QmlViewer: Translate UIKai Koehne2011-05-028-126/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install translators for the Qt & QmlViewer translations. also add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated strings. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14848
| | * | | | | | | Fix insert and scroll to bottom casemae2011-04-262-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using QtextCursor::insert() with a large text followed by setting the vertical scrollbar to its maximum value (scroll to bottom), QPlainTextEdit would not behave properly if a document size change was triggered by the insertion due to line wrapping. This was visible in Qt Creator. Auto test included. Reviewed-by: con
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-04-141809-96541/+116105
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (485 commits) Remove a race condition in SIGCHLD handler. Fix warnings about && inside || Update XCreateWindow in qgl_X11egl.cpp Allow enum values to be used as signal parameters ListModel::clear() should not clear roles Lancelot: support for custom keys added to protocol. API cleanup. Make sure removed QTextBlock is invalid Cocoa: Fixup wrong code in patch baaa5ae 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 Updated QtOpenGL DEF file Lancelot: bail out if rendering consistently fails Minor optimization to lance/elot Make it possible to test the new font hinting in lance[elot] ...
| | * | | | | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-141809-96541/+116105
| | |\ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-04-132-2/+74
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: QDeclarativeDebug: Fix test case QDeclarativeDebug: Handle case where client with ongoing queries is deleted
| | * | | | | | | | QDeclarativeDebug: Fix test caseKai Koehne2011-03-301-1/+1
| | | | | | | | | |
| | * | | | | | | | QDeclarativeDebug: Handle case where client with ongoing queries is deletedKai Koehne2011-03-302-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4be7080af1e7e8a834b927b6c6fc211db8bd90c0 Reviewed-by: Aaron Kennedy
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-29129-736/+76106
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (93 commits) Designer: Fix tab order in action editor dialog. tst_qlocale: improve failure message in tst_QLocale::macDefaultLocale Add a once-over unrolled fromLatin1 conversion (32 characters) Add 16-byte loads of the Neon fromLatin1 functions Fix warning about unused parameter Make QtUiTools use the lib-infix passed to configure. Skip failing tests Removed old autotest references from Symbian build files Icon in QMessageBox::question is deformed on Symbian Prevent crash when connecting signal in splitview GraphicsViews: Focused widget is not visible after orientation change GraphicsViews: Focused widget is not visible after orientation change Add missing nullify for the s60 style's background pixmap pointer. Fixes QT-4753 sort out stdout vs. stderr usage Updated QtGUI DEF files for WINSCW Handle removal of setter for partialUpdateSupport Remove the use of the QtTest baseline feature I reverted Revert "Add a feature to QTestLib to correct benchmark results." Use the ARM version of UTF-8 detection in the Neon code ...
| | * | | | | | | | Merge ../qt-qml-stagingYann Bodson2011-03-29129-736/+76106
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Remove compile warning
| | * | | | | | | | | Remove compile warningAlan Alpert2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If209db684878ab734b3265b479c59dfc27b18be1
| * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-23507-5569/+22492
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (262 commits) Fix QUnifiedTimer bug Designer: Avoid nested QDialog's in item widget content dialogs. Designer: Remember default of main container's object name. Optimized glyph uploads in GL texture cache. Designer: Do not translate page object names of QMdiArea. qmake vcproj generator: do not insert $(INHERIT) Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro Added setSwitchPolicy to MeeGo graphicssystem helper API. Add /q switch to QMAKE_DEL_FILE command in symbian Remove undefined symbol from tst_qwindowsurface. Fix def files Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Fixes detected by the static-check Fix accidental population of the disk cache with partial content Fix disk cache interaction for range retrieval HTTP requests. Fixup license headers in Lighthouse plugins Fixes: some text fields in PNG image files were not read Clipboard/Windows: Fix a hang when sending to non-responsive clients. ...
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-23505-5568/+22484
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix QUnifiedTimer bugAlan Alpert2011-03-232-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pause animations (like Timer) could trigger a jump to the next tick, which meant that other pause animations would have missed the interval skipped by the pause. Change-Id: Idebe4cbe70b2a1536d684288fc1c5d65e4c5df84 Cherry-pick-of: 115d437efb25adc2262460e001c034ea3cd8ba14 Task-number: QTBUG-18126 Reviewed-by: Leo Cunha Reviewed-by: Michael Brasser
| * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-166-2/+104
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Stop the animation driver when there are no more animations. Optimization and benchmark for setting object properties from QML.
| | * | | | | | | | | | Stop the animation driver when there are no more animations.Michael Brasser2011-03-162-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If03c9e4539e984db725f7e7d89e8b565890fcbed Reviewed-by: Gunnar Sletta
| | * | | | | | | | | | Optimization and benchmark for setting object properties from QML.Michael Brasser2011-03-164-1/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib923e5d3946e99001ef682a9dd8ca6d7788818a3 Reviewed-by: Aaron Kennedy
| * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-16586-3500/+14742
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (345 commits) QS60Style: QTreeView::indexRowSizeHint returns incorrect value Fix TextEdit mouseSelectionMode overriding selectByMouse. Deprecate QScriptValue::UserRange Deprecate QScriptValue::QObjectMember Fix static text item positioning GL2 paint engine Fix combining marks handling in Core Text shaper Update QML "What's New" docs. Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode. Fix ListView boundary extents for RTL layout. Fix compiler warning. Update copyright year to 2011. Fix for major regression in OpenVG clipping Fix QGraphicsScene returning incorrect focus item. Cast int to HALData::TAttribute for QT_HALData_ENumCpus and compile with RVCT4. Not requiring valid QTextBlock in previous() Don't use EGL surfaces for translucency with 32MB GPU chip. Fix for fromSymbianCFbsBitmap changing the source data unexpectedly. Background app visible after split view closed Configuring a static Qt build did not exclude WebKit if the -webkit option was given. Get the number of cores from HAL on Symbian. ...
| | * | | | | | | | | | Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-16586-3500/+14742
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-143-2/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Add Constant and Final flags to QMetaObjectBuilder
| | * | | | | | | | | | | Add Constant and Final flags to QMetaObjectBuilderBea Lam2011-03-143-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25090e833f7ce184bcbf2bc5b9281c27ab05aa2d Reviewed-by: Michael Brasser