summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-116-11/+24
|\
| * Merge remote branch 'qt/4.8' into staging-masterShane Kearns2011-05-103-4/+8
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-092-3/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: ifdef out mac/no_coreservices path more cleanly fix build on symbian
| | | * ifdef out mac/no_coreservices path more cleanlyOswald Buddenhagen2011-05-091-3/+2
| | | | | | | | | | | | | | | | the symbian path was also dead
| | | * fix build on symbianOswald Buddenhagen2011-05-091-0/+5
| | | | | | | | | | | | | | | | provide dummy implementation of QProcessEnvironment::systemEnvironment()
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-05-061-5/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Do not allow multiple threads to acquire a QMutex
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-061-1/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case Massively update the hurd-g++ mkspec. rebuild configure
| | | * | QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the ↵Pino Toscano2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no-PATH_MAX case ... in the same way as done in the other code path. This makes qmake/QtCore compile again on glibc systems without PATH_MAX (e.g. GNU/Hurd). Merge-request: 1218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | Merge branch 'symbian-socket-engine' into staging-masterShane Kearns2011-05-101-0/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix crash when QSocketNotifier used with an invalid descriptorShane Kearns2011-04-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | select code for open C file/socket descriptors was crashing in FD_SET if a QSocketNotifier was created with an invalid descriptor. Added two autotests to QSocketNotifier, one to check notifiers with bogus socket descriptors don't crash, the other to check that notifiers with posix socket descriptors do work. (symbian socket engine doesn't use them so they are not implicitly tested) Reviewed-by: mread Task-Number: QTBUG-18138
| * | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8Bradley T. Hughes2011-05-062-72/+99
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-05-061-70/+97
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QSslConfiguration documentation fix Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget. HTTP auto tests: do not load resources from cache that must be revalidtd HTTP cache backend: do not load resources that must be revalidated HTTP backend: do not load resources from cache that must be revalidated Compile fix for QLocale on Symbian. Added Kazakh language to the QLocale mapping table on Symbian. Added support for QLocale::uiLanguages on Symbian.
| | * \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-051-2/+2
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: QNAM HTTP: Fix bug with explicitly zero-length compressed responses. Add enablers for Symbian App Booster Don't rely on uninitialized data Don't realloc user-provided buffer
| | | * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-041-2/+2
| | | |\ \ \
| | | | * | | Don't realloc user-provided bufferJoão Abecasis2011-05-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QTextBoundaryFinder doesn't own the buffer, don't realloc it and get a new one instead. Reviewed-by: Ritt Konstantin
| * | | | | | Do not allow multiple threads to acquire a QMutexBradley T. Hughes2011-05-051-5/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the mutex optimizations on Mac, we did not handle the case where semaphore_wait() could return KERN_ABORTED. Under heavy contention, this happens, and when running in release mode, the assert in qmutex.cpp is not executed. The code silently allows multiple threads to continue as if it had acquired the mutex exclusively. Fix this by checking for KERN_ABORTED from semaphore_wait(), and retry the wait. We do not handle KERN_ABORTED for timed waits, simply return false and let the code doing the tryLock() handle it how it deems best. Reviewed-by: joao
* | | | | | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-094-20/+15
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.8 we added support for using StringBuilder with QByteArray. But this is breaking source compatibility for people that used QT_USE_FAST_OPERATOR_PLUS in Qt 4.7. So we introduce a new macro Notice that QT_USE_FAST_CONCATENATION was not working without QT_USE_FAST_OPERATOR_PLUS, so we remove the checking of that macro. Reviewed-by: joao
* | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-058-92/+207
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-054-90/+197
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | 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 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
| | * | | | 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-293-2/+4
| | |\ \ \ \ | | | |/ / /
| | * | | | 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-293-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Revert "Added QStringRef::toLatin1 and QStringRef::toUtf8"Thorbjørn Lindeijer2011-04-282-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit feabda665de62a0f6a82d831b45926697f30b45b. They were already added by Denis Dzyubenko in commit 2916b074.
| | * | | | Added QStringRef::toLatin1 and QStringRef::toUtf8Thorbjørn Lindeijer2011-04-272-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These helper functions make it convenient to avoid making an unnecessary copy of the string before converting it to a QByteArray. The current most obvious way to do this would be: // QStringRef text QByteArray latin1 = text.toString().toLatin1(); Though the copy can also be avoided by doing: const QString textData = QString::fromRawData(text.unicode(), text.size()); QByteArray latin1 = textData.toLatin1(); Now the faster method can be achieved using the new obvious way: QByteArray latin1 = text.toLatin1(); Reviewed-by: Thiago Macieira Reviewed-by: Robin Burchell
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-05-052-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'qt/4.8'Sami Lempinen2011-04-2855-8947/+12579
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | 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
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-042-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ../qt-qml-stagingMichael Brasser2011-04-1437-531/+1348
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge ../qt-qml-stagingYann Bodson2011-03-298-6/+24
| | |\ \ \ \ \ \ \
| | * | | | | | | | Remove compile warningAlan Alpert2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If209db684878ab734b3265b479c59dfc27b18be1
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-2320-49/+90
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| | * | | | | | | | | Stop the animation driver when there are no more animations.Michael Brasser2011-03-162-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If03c9e4539e984db725f7e7d89e8b565890fcbed Reviewed-by: Gunnar Sletta
* | | | | | | | | | | Compile fix for QLocale on Symbian.Denis Dzyubenko2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous change added new ELangEnglish_India that doesn't necesserally present in all SDKs. Reviewed-by: trustme
* | | | | | | | | | | Added Kazakh language to the QLocale mapping table on Symbian.Denis Dzyubenko2011-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme