summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-204-20/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qgl_qpa.cpp src/plugins/platforms/glxconvenience/qglxconvenience.cpp src/plugins/platforms/platforms.pro src/plugins/platforms/wayland/qwaylandwindow.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/plugins/platforms/xcb/qxcbwindow.h src/plugins/platforms/xcb/qxcbwindowsurface.cpp src/widgets/kernel/qwidget_qpa.cpp tests/auto/qvariant/tst_qvariant.cpp
| * QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-184-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 (cherry picked from commit 8447f5616be731d78081f326bb9cb3f5aa9087a4)
* | Port Qt 5 to Mac.Morten Sorvig2011-05-181-4/+5
| |
* | Merge remote branch 'origin/master' into refactorLars Knoll2011-05-163-96/+6
|\| | | | | | | | | | | Conflicts: src/modules/qt_openvg.pri src/widgets/to_be_moved/qlinecontrol_p.h
| * Removed deprecated functions in QListEckhart Koppen2011-05-131-91/+0
| | | | | | | | | | Removed detach, detach2, detach3 and append which were marked as required only up to 4.5.x
| * Updated Qt and QtBase module version number to 5.0.0Eckhart Koppen2011-05-131-2/+2
| | | | | | | | Updated version in qglobal.h as well as the module version itself
| * Updated data stream version for Qt 4.9 and 5.0Eckhart Koppen2011-05-131-3/+4
| | | | | | | | | | For now, using the same version as 4.8. This needs to be corrected when the actual data stream version is known.
* | Merge remote branch 'origin/master' into refactorLars Knoll2011-05-125-4/+22
|\| | | | | | | | | | | | | | | Conflicts: src/gui/gui.pro src/gui/painting/painting.pri src/opengl/opengl.pro src/openvg/openvg.pro
| * Add the QIdentityProxyModel.Stephen Kelly2011-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older commit history is in KDE svn: http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log Ammended to update the license headers. Merge-request: 900 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> Conflicts: doc/src/frameworks-technologies/model-view-programming.qdoc tests/auto/headers/tst_headers.cpp (cherry picked from b00089261eafbdf5f92ed94d7fb20b402bfcaeb2)
| * make QLibraryInfo return clean pathsOswald Buddenhagen2011-05-111-4/+6
| | | | | | | | | | | | | | | | | | as a side effect, don't use QDir for path resolution - it doesn't buy us anything. Task-number: QTBUG-1371 Reviewed-by: joerg (cherry picked from commit 9cd62e4f7b23894a672297f6eebda64cdbd53cb0)
| * make relative paths in qt.conf work inside qmakeOswald Buddenhagen2011-05-111-1/+1
| | | | | | | | | | | | Task-number: QTBUG-11602 Reviewed-by: joerg (cherry picked from commit e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e)
| * Fix crash when QSocketNotifier used with an invalid descriptorShane Kearns2011-05-111-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 (cherry picked from commit 8a9a6afcf02f089f932bc81431ab46a60af32134)
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-0/+6
| |\ | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fix tst_QVariant::invalidColor Move QTextCursor::MoveStyle to Qt namespace Add some QRawFont related low level functions to avoid extra copying
| | * Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use QTextCursor::MoveStyle enums in QTextLine because QTextCursor is not a QObject, while referring to that enum in Q_PROPERTY requires it to be. That's why we need to move the enums in Qt namespace. Reviewed-by: David Boddie (cherry picked from commit 5eba82b752e85a5d6cb3a893214ed2646d75f362)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-111-0/+3
| |\ \ | | |/ | |/| | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Add QT_xxx_VERSION macros for each library in qtbase
| | * Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-101-0/+3
| | | | | | | | | | | | | | | | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* | | Merge remote branch 'staging/master' into refactorSamuel Rødal2011-05-1126-1291/+668
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp
| * | ifdef out mac/no_coreservices path more cleanlyOswald Buddenhagen2011-05-101-3/+2
| | | | | | | | | | | | | | | the symbian path was also dead (cherry picked from commit 76ac26383922b4c452592a9175e7f3b9b3fd2513)
| * | fix build on symbianOswald Buddenhagen2011-05-101-0/+5
| | | | | | | | | | | | | | | provide dummy implementation of QProcessEnvironment::systemEnvironment() (cherry picked from commit e4920a4b4bc454ad309324a62db0e9257bba7367)
| * | QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the ↵Pino Toscano2011-05-101-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> (cherry picked from commit c8812fe6e642520532d65744caefcea790d59de8)
| * | 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)
| * | 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)
| * | 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)
| * | 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)
| * | 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)
| * | 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)
| * | 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 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-103-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 (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-104-35/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | Revert "Added QStringRef::toLatin1 and QStringRef::toUtf8"Thorbjørn Lindeijer2011-05-102-43/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit feabda665de62a0f6a82d831b45926697f30b45b. They were already added by Denis Dzyubenko in commit 2916b074. (cherry picked from commit ffe0a2ec7c1f4412792a977401bdc4dbf6c76acd)
| * | Fixes warningsOlivier Goffart2011-05-103-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QString, it would comlain that: assuming signed overflow does not occur when assuming that (X - c) > X is always false Changing to unsigned comparison fix the warning Others are about unused variables Reviewed-by: Thiago (cherry picked from commit 5e5485809e8c6f8339bb9f19ad71ed623a8b23c7)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 20:26:57 +0000