summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Massively update the hurd-g++ mkspec.Pino Toscano2011-05-101-72/+56
| | | | | | | | | | | | Bring it to the same level as linux-g++: - copy the defines from common/linux.conf - use the common gcc/g++ .conf files - keep the trick of linking the pthread library everywhere - leave out the wayland variables, which are not useful for Hurd Merge-request: 1219 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 027605f67f73c8021c1ae604adad298599785a79)
* Do not allow multiple threads to acquire a QMutexBradley T. Hughes2011-05-101-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 (cherry picked from commit b54af0a9d6406356616889826e31925d2fa05718)
* Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-103-18/+56
| | | | | | | | | | | | | | | | | | This case may be triggered in the (admittedly slightly abnormal) case where a user wishes to embed the calendar widget in a layout or, for whatever reason, do something else that will change its ownership. We work around this by detecting when it is deleted and recreating the widget. This will also have a positive side effect if setCalendarWidget() is called with a widget which is then subsequently deleted, returning the default widget instead of a pointer to (now deleted) memory. Reviewed-by: Denis Dzyubenko Merge-request: 2568 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 124ec3200f8453142717fcfe7a4aa0a55164aaa6)
* don't crash in QProcessEnvironment::systemEnvironment()Oswald Buddenhagen2011-05-102-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 (cherry picked from commit c79246683a5033f605acd59d1c37d68381383a06)
* HTTP backend: do not load resources from cache that must be revalidatedPeter Hartmann2011-05-101-7/+5
| | | | | | | | | | | | The header field "Cache-Control: must-revalidate" is a strict requirement for loading the resource from the server, and not reading it from the cache without revalidating first. With this patch, PreferCache will load such from the network instead of loading them from the cache, and AlwaysCache will throw a ContentNotFound error. Reviewed-by: Markus Goetz Task-number: QTBUG-18983 (cherry picked from commit 0e449f38894b1bd2dbb2f14206a011424679f063)
* Compile fix for QLocale on Symbian.Denis Dzyubenko2011-05-101-1/+1
| | | | | | | | The previous change added new ELangEnglish_India that doesn't necesserally present in all SDKs. Reviewed-by: trustme (cherry picked from commit 154ab1cb4c4cdf34f21fc93b078f91cc79048bd4)
* Added Kazakh language to the QLocale mapping table on Symbian.Denis Dzyubenko2011-05-101-0/+1
| | | | | Reviewed-by: trustme (cherry picked from commit c6808af66d45541546b30c8e6de155b9812b4ef9)
* Added support for QLocale::uiLanguages on Symbian.Denis Dzyubenko2011-05-101-70/+96
| | | | | | | | | Extended the mapping table that matches symbian device languages to a locale name and language code. Task-number: QTBUG-7329 Reviewed-by: trustme (cherry picked from commit 93233fc811920002d5b5b8272d9b5b8d5d3e2b98)
* Fix drawing text in item view:Olivier Goffart2011-05-101-0/+21
| | | | | | | Put back code that was removed by mistake in e8019cf8feb402303e6d253f5ca58bebfda42679 Task-number: QTBUG-18998 (cherry picked from commit bbbd4b8f3949b58d4fd21854241cb46cbc024a80)
* Add enablers for Symbian App BoosterSimon Frost2011-05-102-0/+33
| | | | | | | | | | | | | To use the Symbian App Booster, a registration file (matching the filename of the executable, eg helloworld.applite) must be copied to the import folder within QtAppBooster's private directory. The appropriate library (qdeclarativebooster) must also be linked against. With this change, the required actions are carried out by adding "CONFIG += symbian_appbooster" to the application's .pro file. Task-number: QT-4892 Reviewed-by: Miikka Heikkinen (cherry picked from commit ae128aef03d246c9f89bed015092b1c5a925bcbc)
* Don't rely on uninitialized dataJoão Abecasis2011-05-101-0/+1
| | | | | | | | | | | HB_GetCharAttributes used to require a zero-initialized array for attributes, as it selectively sets relevant bits for each character. We ease that requirement by always initializing the attributes buffer explicitly with memset. Task-number: QT-4911 Reviewed-by: Ritt Konstantin (cherry picked from commit 4cb9db404224c55859713c282aa90409e375c372)
* Don't realloc user-provided bufferJoão Abecasis2011-05-101-2/+2
| | | | | | | | When QTextBoundaryFinder doesn't own the buffer, don't realloc it and get a new one instead. Reviewed-by: Ritt Konstantin (cherry picked from commit 320f172c851a4720299297c8b3b757eb1202c568)
* qmake: Introduce new template typeChristian Kandeler2011-05-104-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 (cherry picked from commit 56443421cb5e537e60abd7ced42c9ebf587683fe)
* Make autotest more resilient against network timeoutaavit2011-05-103-6/+9
| | | | (cherry picked from commit 50be38737507f5c23b4d050e635a200024164a13)
* Do not filter adhoc clientsaavit2011-05-101-2/+2
| | | | (cherry picked from commit 4fe5307af44a76b99cc8c70aa330180c1985eabc)
* Lancelot: Add configurable client filtering to baseline serveraavit2011-05-102-10/+32
| | | | (cherry picked from commit d499f7ca995e40f7a75f913ff0f07d9a73fa3559)
* Improve error reporting on failure to connect to baseline serveraavit2011-05-102-1/+2
| | | | (cherry picked from commit 9d75ff6fa8f8844ff6599b68618821cd8c501757)
* Fixed bug in X11 backend when creating translucent windows.Samuel Rødal2011-05-101-2/+7
| | | | | | | | We forgot to send the ParentAboutToChange event, which meant QGLWidget didn't destroy the old EGL surface. This could cause two EGL surfaces to be created for the same QGLWidget, which leads to undefined behaviour on some platforms. (cherry picked from commit 5a834d7141cc7d29d022911ccec16e628d94acf1)
* Fix the tst_QPluginLoader::loadCorruptElf on 64 bitOlivier Goffart2011-05-101-3/+3
| | | | | | | The error message do not match Reviewed-by: Arvid Ephraim Picciani (cherry picked from commit 383f57dd2669b71fd14cf9b6b56213423a3d2d01)
* Clarified sendCustomRequest documentation to include HTTPSJanne Anttila2011-05-101-1/+1
| | | | | Reviewed-By: mgoetz (cherry picked from commit 16b8c940dac02ec77e6ff9fe4150c32db1811e74)
* Fix compilationOlivier Goffart2011-05-101-1/+0
| | | | | Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b (cherry picked from commit 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58)
* no environment on WinCEOswald Buddenhagen2011-05-101-0/+4
| | | | (cherry picked from commit 62e73a463cb7035192acdce6538c5b0248e643d4)
* fix Widestring vs. Ansi mixupOswald Buddenhagen2011-05-101-1/+1
| | | | (cherry picked from commit 4dcb4a41022085aa82f25f7e0a2ce9e92510f4ae)
* fix potential crash in QProcessEnvironment::systemEnvironment() on windowsOswald Buddenhagen2011-05-101-10/+11
| | | | | GetEnvironmentStrings() can theoretically return null (cherry picked from commit 443608952d7df9a5146317be992320ba232d2cf9)
* Only cleanup share widget if it has been created.Armin Berres2011-05-101-3/+9
| | | | | | | | | | | | | Without this change a not yet created share widget is created once qt_destroy_gl_share_widget() is called. As creating the widget also triggers a call to qt_cleanup_gl_share_widget() once QApplication is destroyed a QApplication created afterwards cannot use a share widget anymore. This functionality is needed for Harmattan. Merge-request: 2609 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> (cherry picked from commit 8680d831fb7066feae07690a4a6bc8e908a84e5a)
* Fix the build of configure.exe.Liang Qi2011-05-101-0/+2
| | | | | | | | qlocale functions were splitted in severl files, just add them back. Task-number: QTBUG-18932 Reviewed-by: TrustMe (cherry picked from commit 3782dc6d92210e9ae5fb7ee27cc7cd78dee79ebf)
* Update the source file of configure.exe to enable QtConcurrent for SymbianLiang Qi2011-05-101-2/+0
| | | | (cherry picked from commit 8769c84663943fda853f5aa248fa95391594347e)
* Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.Liang Qi2011-05-101-18/+0
| | | | | Because Qt doesn't support that feature before. (cherry picked from commit c12ed14fb38ae77be194e19a27545190aded830b)
* Compile with msvcOlivier Goffart2011-05-101-4/+16
| | | | | msvc tries to instenties the return type of overloads that are not chosen by overload resolution (cherry picked from commit 7307d712e10783b57c4c95c8390a9455b69f473a)
* compile with windowsOlivier Goffart2011-05-101-4/+4
| | | | | MSVC doesn't pick up the right template partial specialisation. (cherry picked from commit 0188f5ee18d00ae18e65a03c712d3f701e84fa80)
* get rid of the DisableIfSame hackOlivier Goffart2011-05-102-16/+4
| | | | | By changing the order of the parametters, in a way it is unlikely to clash (cherry picked from commit e9d198b5928e1adf678796c098113bc307ef53f5)
* Rewrite the interfaces of QtConcurrent.Liang Qi2011-05-103-1057/+270
| | | | | | | | | | At least make RVCT 2.2 work. Task-number: QTBUG-5182 Task-number: QTBUG-9070 Reviewed-by: Olivier Goffart Reviewed-by: joao (cherry picked from commit 0ba0c374fe055623381e3795daa6743c5c995bbc)
* Fix namespace issue with the global staticmae2011-05-101-2/+2
| | | | (cherry picked from commit c99be6bf73dce10fc706764b72a8dacc1c6589a0)
* Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bitMatthew Cattell2011-05-101-1/+4
| | | | | | | | Regression from 4.5 causing performance and size degradation. Task-number: QTBUG-18997 Reviewed-by: Samuel (cherry picked from commit 18122b473ecbd85ba953f70743b1756358bf7c0c)
* Fix regression with QSettings patchmae2011-05-103-13/+12
| | | | | | The plugin loader is used without QCoreApplication. This fixes 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5 (cherry picked from commit 988871dabf3c949ffc71d126131281a3ae641ebf)
* Fix trailing whitespacesJani Hautakangas2011-05-102-2/+2
| | | | | Reviewed-by: TRUSTME (cherry picked from commit d4fd21f746b536eaddbdd7a07f1d717ef18278e7)
* Fix for native child widget performance issue.Jani Hautakangas2011-05-102-0/+22
| | | | | | | | | | | | | | Flushing native child widgets in VG and GL window surfaces caused performance downgrade because unnecessary swapBuffers calls. On Symbian we must not support flushing native child widgets in VG and GL window surfaces because it causes GPU memory overhead and performance issues. Symbian graphics architecture allows us to render native child widgets to TLW EGL surface correctly in most of the cases. Task-number: QTMOBILITY-1570 Reviewed-by: Samuel Rødal (cherry picked from commit 6a92de7c89764848f7a85b1aa412a07bedc72b1a)
* fix build on symbianOswald Buddenhagen2011-05-101-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 (cherry picked from commit 167044693cc1d16684a5732b05e3926d0af61960)
* fix build on macOswald Buddenhagen2011-05-101-0/+12
| | | | | environ needs to be declared properly (cherry picked from commit aae6ef391d2ee2fa5b91c834ea65f14fd61e5af6)
* make QProcessEnvironment on Unix cache converted valuesOswald Buddenhagen2011-05-102-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 (cherry picked from commit 7aa4ecdedba60ac4cbc07a774ae9d834677002e9)
* make QProcessEnvironment::systemEnvironment() encoding-safeOswald Buddenhagen2011-05-103-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 (cherry picked from commit 60194ad0ea68d7c82b4729119d122dcfeb909842)
* make QProcessEnvironment on Unix cache converted variable namesOswald Buddenhagen2011-05-103-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 (cherry picked from commit 18f1613aa8ece72d24ac10e28f06e3db1d8ce400)
* move key/value converters to the private classOswald Buddenhagen2011-05-102-24/+15
| | | | | | | | this will enable them to access other members later Reviewed-by: thiago Reviewed-by: dt (cherry picked from commit a2d70d71c8c7652ded41d5d603672c3927df44e6)
* make QProcessEnvironment on Windows preserve variable name caseOswald Buddenhagen2011-05-104-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 (cherry picked from commit f3db5603871928ebed43a085a496397e65952b39)
* split QProcessEnvironmentPrivate::Unit into Key and ValueOswald Buddenhagen2011-05-102-11/+14
| | | | | | Reviewed-by: thiago Reviewed-by: dt (cherry picked from commit 11a79c65ea992be0e2ede7dc8f60660c9190291f)
* remove unused functionsOswald Buddenhagen2011-05-101-12/+0
| | | | | | Reviewed-by: thiago Reviewed-by: dt (cherry picked from commit e989a4d375b279b3ea61139cb07596e0e4b79e28)
* minor optimization: use QList::reserve()Oswald Buddenhagen2011-05-101-0/+2
| | | | | | Reviewed-by: thiago Reviewed-by: dt (cherry picked from commit 6a53f17c7039f1a5405912a4a645572e215410bb)
* use the Hash typedefOswald Buddenhagen2011-05-103-13/+13
| | | | | | Reviewed-by: thiago Reviewed-by: dt (cherry picked from commit 10fd0d3e5c88c7b0265db3acdd75cb3d6f35ee63)
* Reduce open and stat system calls for QSettingsmae2011-05-105-35/+24
| | | | | | | | | | | | | | The patch moves the global static QSettings object from QLibrary to QCoreApplication and reduces a few stat and open calls. Without the patch, a large Trolltech.conf was pushed out of the unused settings cache during startup, meaning Trolltech.conf was parsed more than once. Reviewed-by: Liang Qi (cherry picked from commit 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5)
* Add missing license headersJan-Arve Sæther2011-05-103-0/+123
| | | | (cherry picked from commit d5ee1bc752dc8aed717776a80e9e15972dd98065)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 22:11:40 +0000