summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-062-20/+51
| | | | | Task-number: QTBUG-18426 Reviewed-by: Peter Hartmann
* Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-05138-823/+2748
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-0514-103/+250
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: don't crash in QProcessEnvironment::systemEnvironment() qmake: Introduce new template type no environment on WinCE fix Widestring vs. Ansi mixup fix potential crash in QProcessEnvironment::systemEnvironment() on windows Fix compilation with QT_NO_* fix build on symbian skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor fix build on mac make QProcessEnvironment on Unix cache converted values make QProcessEnvironment::systemEnvironment() encoding-safe make QProcessEnvironment on Unix cache converted variable names move key/value converters to the private class make QProcessEnvironment on Windows preserve variable name case split QProcessEnvironmentPrivate::Unit into Key and Value remove unused functions minor optimization: use QList::reserve() use the Hash typedef Changelog: Qt Designer 4.8
| | * don't crash in QProcessEnvironment::systemEnvironment()Oswald Buddenhagen2011-05-042-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | as the implementations moved to platform-specific files, the QSharedDataPointer<QProcessEnvironmentPrivate>::detach() specialization needs to go to the private header. Reviewed-by: thiago
| | * qmake: Introduce new template typeChristian Kandeler2011-05-034-4/+26
| | | | | | | | | | | | | | | | | | The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point). Reviewed-by: Joerg Bornemann
| | * no environment on WinCEOswald Buddenhagen2011-05-021-0/+4
| | |
| | * fix Widestring vs. Ansi mixupOswald Buddenhagen2011-05-021-1/+1
| | |
| | * fix potential crash in QProcessEnvironment::systemEnvironment() on windowsOswald Buddenhagen2011-05-021-10/+11
| | | | | | | | | | | | GetEnvironmentStrings() can theoretically return null
| | * Fix compilation with QT_NO_*Tasuku Suzuki2011-05-023-0/+9
| | | | | | | | | | | | | | | Merge-request: 1206 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * fix build on symbianOswald Buddenhagen2011-05-021-62/+60
| | | | | | | | | | | | | | | | | | | | | | | | Error: #793: explicit specialization of class "QTypeInfo<QProcessEnvironmentPrivate::Key>" must precede its first use just un-nest QProcessEnvironmentPrivate::{Key,Value} Reviewed-by: thiago
| | * skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditorTasuku Suzuki2011-05-021-1/+1
| | | | | | | | | | | | | | | | | | TabOrderEditor should allow user to set tab order for widget that focusPolicy contains Qt::TabFocus. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| | * fix build on macOswald Buddenhagen2011-05-021-0/+12
| | | | | | | | | | | | environ needs to be declared properly
| | * Merge remote-tracking branch 'origin/4.8' into HEADThiago Macieira2011-04-29143-1244/+4582
| | |\
| | * | make QProcessEnvironment on Unix cache converted valuesOswald Buddenhagen2011-04-292-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values are converted between byte arrays and qstrings on demand. this makes it feasible to use the class as a generic environment container with fast reading and writing access. Reviewed-by: thiago Reviewed-by: dt
| | * | make QProcessEnvironment::systemEnvironment() encoding-safeOswald Buddenhagen2011-04-293-15/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on unix, don't do the roundtrip over unicode. on windows, use the WinAPI unicode environment instead of the 8-bit CRT environment. Reviewed-by: thiago Reviewed-by: dt
| | * | make QProcessEnvironment on Unix cache converted variable namesOswald Buddenhagen2011-04-293-11/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the converted keys also cache their hash, as they are used only for the purpose of looking up in a qhash. Reviewed-by: thiago Reviewed-by: dt
| | * | move key/value converters to the private classOswald Buddenhagen2011-04-292-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this will enable them to access other members later Reviewed-by: thiago Reviewed-by: dt
| | * | make QProcessEnvironment on Windows preserve variable name caseOswald Buddenhagen2011-04-294-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | while windows itself does not care which case the variable names are in, they may be passed to unix tools which *do* care. note that this uses true case folding for string comparisons while windows uses uppercasing. this means that "ess" and "eß" will be considered the same by us, while not by windows. this is not expected to have real-world impact, particularly because non-ascii variable names are not used much. Task-number: QTCREATORBUG-3110 Reviewed-by: thiago Reviewed-by: dt
| | * | split QProcessEnvironmentPrivate::Unit into Key and ValueOswald Buddenhagen2011-04-292-11/+14
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thiago Reviewed-by: dt
| | * | remove unused functionsOswald Buddenhagen2011-04-291-12/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thiago Reviewed-by: dt
| | * | minor optimization: use QList::reserve()Oswald Buddenhagen2011-04-291-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thiago Reviewed-by: dt
| | * | use the Hash typedefOswald Buddenhagen2011-04-293-13/+13
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thiago Reviewed-by: dt
| | * | Changelog: Qt Designer 4.8Friedemann Kleint2011-04-281-2/+10
| | | |
| * | | 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