summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Protect against deleted windowsLars Knoll2011-06-081-0/+16
| | | | | | | Check that the window is still there before trying to deliver an event to it. Reviewed-by: Samuel
* Fix compile when configure with no fontconfig supportJiang Jiang2011-06-081-3/+3
| | | | | Task-number: QTBUG-19716 Reviewed-by: Eskil
* Fix warning in qtextengine compilationJiang Jiang2011-06-081-1/+1
| | | | | | enableHarfbuzz() should only be defined on Mac. Reviewed-by: Eskil
* Reorder member varibles in QGlyphRunPrivate to eliminate warningJiang Jiang2011-06-081-4/+4
| | | | Reviewed-by: Eskil
* Revert 36e01e69Jiang Jiang2011-06-081-4/+0
| | | | | | | The way we handle glyph cache in QFontEngineFT has changed, the memory leak fix should not be applied to 4.8. Reviewed-by: Eskil
* Fixed compile of tst_qscriptextensionplugin on some Windows configurationsRohan McGovern2011-06-071-0/+1
| | | | | | | | | | | | The debug and release versions of staticplugin are qmake'd with the same destination directory. This causes the generated staticplugin .prl file to always refer to the debug versions of Qt libraries, even if Qt was configured with -release. The .prl mechanism is not useful for this test, so simply disable it to solve the problem. Reviewed-by: ckamm
* Add function QGlyphRun::setRawData()Eskil Abrahamsen Blomfeldt2011-06-067-53/+190
| | | | | | | | | | | | | | | | | | | | To provide an optimized way of constructing QGlyphRun objects with no copying or allocation, we add function setRawData() (naming inspired by QByteArray::setRawData()). Data retrieved from QRawFont can be passed directly into this. The logic is now that the data pointers in QGlyphRunPrivate should always point to the current valid data and is what will be used in comparisons and drawing calls. The vectors are optimizations to avoid unnecessary copying if the user wants to use the QVector based API (which makes it easier to manage the memory.) This reflected in the functions that return QVectors, which will return the stored vector if and only if it is identical to the current pointer. Otherwise we will have to copy the memory. The internal addition operators in QGlyphRun have been removed since they really provide no real optimization and have an unclear definition if the two glyph runs are based on different fonts. Reviewed-by: Jiang Jiang
* Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-068550-150045/+154333
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/wayland/qwaylandclipboard.cpp src/plugins/platforms/wayland/qwaylandclipboard.h src/plugins/platforms/wayland/qwaylanddisplay.cpp src/s60installs/eabi/QtOpenGLu.def
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-017-239/+201
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: drop the SysV semaphores -specific code out from QWSSignalHandler minor refactoring of the QWSLock class simplify the code by using the EINTR_LOOP macro simplify the semaphores initialization minor refactoring of the QLock class add a warning on an incorrect usage of QLock make sure we really clear all locks fix build with QT_NO_QWS_SIGNALHANDLER use a printErr() function instead of std::cerr like in lupdate
| | * drop the SysV semaphores -specific code out from QWSSignalHandlerRitt Konstantin2011-06-014-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is safe to call the QLock/QWSLock desctructors instead on normal exit where both lists should be empty; on crash, we don't care about semi-alive objects and the only important thing is to unregister the system semaphores. Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * minor refactoring of the QWSLock classRitt Konstantin2011-06-012-68/+47
| | | | | | | | | | | | | | | | | | | | | | | | unify both constructors in a single one; make the code cleaner and cheaper Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * simplify the code by using the EINTR_LOOP macroRitt Konstantin2011-06-011-36/+36
| | | | | | | | | | | | | | | | | | | | | the sembuf structure now initializes out of the loop (nano-opt) Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * simplify the semaphores initializationRitt Konstantin2011-06-011-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | there is no need in 3 separate tests since, for local semaphores, semctl(2) always works. if it's not, well, 1 test is completely enough to check that Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * minor refactoring of the QLock classRitt Konstantin2011-06-011-82/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use EINTR_LOOP macro to simplify the code; code cleanups; minor optimizations; more informative debug strings Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * add a warning on an incorrect usage of QLockRitt Konstantin2011-06-011-0/+2
| | | | | | | | | | | | | | | Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * make sure we really clear all locksRitt Konstantin2011-06-011-1/+1
| | | | | | | | | | | | | | | Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * fix build with QT_NO_QWS_SIGNALHANDLERRitt Konstantin2011-06-014-5/+29
| | | | | | | | | | | | | | | Merge-request: 1237 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-06-018518-143214/+153955
| | |\ | | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-05-313-8/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Fix build in C++0x mode
| | * | Fix build in C++0x modeBernhard Rosenkraenzer2011-05-313-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes compiler errors (gcc 4.6 -std=gnu++0x on x86_64 Linux): embedded/qwslock.cpp: In function `bool forceLock(int, int, int)': embedded/qwslock.cpp:121:39: error: narrowing conversion of `semNum' from `int' to `short unsigned int' inside { } [-fpermissive] (and equivalent errors in other lines/files) See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf Section 8.5.4/6 Change-Id: I2cbac5482b87f33287a416af5a5c9bde621720bc Reviewed-By: Olivier Goffart Merge-Request: 1240 Reviewed-on: http://codereview.qt.nokia.com/275 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 15871d606a0a85cfcd2b68b95c0891165f61e402)
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-05-2748-330/+1298
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (25 commits) Added some of my Qt 4.8 changes to the changelog Update bearer startup code in network autotests symbian socket engine: share ip address conversion code license header check: fix exception for URL TLD table QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..." Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore fix Symbian ordinals for merge request re. utf8 characters in SSL certs add auto test for SSL certificates containing utf8 characters fix coding style for merge request re. utf8 characters in SSL certs Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName Fix the build for QUuid Improved performance of the QLocale::name() function. Optimize QUuid::QUuid(const char *) QDataStream: speedup steaming of QUuid. Add QUuid::toRfc4122() and fromRfc4122() Add QUuid::toByteArray() and relevant Optimize QUuid::toString() and relevant Add some autotests and benchmarks for QUuid tst_qhostinfo: Fix IPv6 lookup detection on Windows. Fix typo in comment ...
| | * | Added some of my Qt 4.8 changes to the changelogOlivier Goffart2011-05-261-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8913c88e5bd68145e0587d51ee9896fd5d21054a Reviewed-on: http://codereview.qt.nokia.com/140 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit bc7ea289ea84dcff22aeea78c01a5447ccf076f7)
| | * | Merge remote-tracking branch 'earth-staging/master'Olivier Goffart2011-05-2611-51/+110
| | |\ \
| | | * | Update bearer startup code in network autotestsShane Kearns2011-05-258-33/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bearer startup code I added to some of the network autotests to ensure the network was up before testing caused test failures on some linux configurations due to there being no default network defined. I've changed it to follow these steps: 1. update the configuration list & wait for update completed signal - due to the polling engines not having any config defined on the first run before the initial poll happens 2. check default configuration is valid before attempting to start it 3a. for valid configuration, start it and wait for started as before 3b. for invalid configuration, fail if bearer is mandatory, otherwise ignore - on symbian bearer use is "mandatory", on desktop platforms it is optional Reviewed-by: Markus Goetz
| | | * | symbian socket engine: share ip address conversion codeShane Kearns2011-05-253-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper function for converting TInetAddr -> QHostAddress is now used in qhostinfo_symbian.cpp as well. This should slightly improve performance by avoiding conversion to/from strings, and also remove some duplicated code. Reviewed-by: Markus Goetz
| | * | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-269-77/+53
| | |\ \ \
| | * | | | license header check: fix exception for URL TLD tablePeter Hartmann2011-05-251-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | the file was renamed and moved to corelib Task-number: QTBUG-13601
| | * | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-248452-141937/+141860
| | |\ \ \
| | * | | | QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."Peter Hartmann2011-05-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see previous commit Task-number: QTBUG-13601
| | * | | | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCoreRobert Hogan2011-05-2414-55/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Qt's copy of the Mozilla public suffix list from QtNetwork to QtCore and use it to expose a new API function QUrl::topLevelDomain(). This function returns the section of the url that is a registrar-controlled top level domain. QtCore now exports a couple of functions to the other Qt modules: qTopLevelDomain, a helper function for QUrl::topLevelDomain(); and qIsEffectiveTLD(), a helper function for QNetworkCookeieJar. The motivation for this new API is to allow QtWebKit implement a Third-Party Cookie blocking policy. For this QtWebKit needs to know the element of the url that is the registry-controlled TLD. Without this knowledge it would end up blocking third-party cookies per host rather than per registry-controlled domain. See also https://bugs.webkit.org/show_bug.cgi?id=45455 Merge-request: 1205 Task-number: QTBUG-13601 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * | | | fix Symbian ordinals for merge request re. utf8 characters in SSL certsPeter Hartmann2011-05-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7912
| | * | | | add auto test for SSL certificates containing utf8 charactersPierre Rossi2011-05-234-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7912 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * | | | fix coding style for merge request re. utf8 characters in SSL certsPierre Rossi2011-05-231-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes minor coding issues for "Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName" Task-number: QTBUG-7912 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * | | | Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerNameRaul Metsma2011-05-233-36/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to be able to display non-ASCII names from subject and issuerInfo. Task-number: QTBUG-7912 Merge-request: 922 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * | | | Fix the build for QUuidLiang Qi2011-05-232-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a quint8 specialization for qbswap. Reviewed-by: Bradley T. Hughes
| | * | | | Improved performance of the QLocale::name() function.Denis Dzyubenko2011-05-201-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19168 Reviewed-by: Zeno Albisser
| | * | | | Optimize QUuid::QUuid(const char *)Liang Qi2011-05-201-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joao
| | * | | | QDataStream: speedup steaming of QUuid.Liang Qi2011-05-201-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By reading and writing as a whole block, because the size of QUuid is fixed. Reviewed-by: joao
| | * | | | Add QUuid::toRfc4122() and fromRfc4122()Liang Qi2011-05-204-0/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the RFC4122, provide the interfaces between QUuid and QByteArray, they are simpler then toByteArray() and relevant. Thanks for the suggestion and brief code from Robin Burchell. Task-number: QTBUG-19420 Reviewed-by: joao
| | * | | | Add QUuid::toByteArray() and relevantLiang Qi2011-05-204-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QUuid::toByteArray() and QUuid(const QByteArray &). Same behavior with QUuid::toString() and QUuid(const QString &). Task-number: QTBUG-19419 Reviewed-by: joao
| | * | | | Optimize QUuid::toString() and relevantLiang Qi2011-05-202-55/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUuid::toString() and QUuid(const QString &) are too slow now. Task-number: QTBUG-19418 Reviewed-by: joao Reviewed-by: Denis Dzyubenko Reviewed-by: Ritt Konstantin Reviewed-by: Robin Burchell Reviewed-by: Richard J. Moore
| | * | | | Add some autotests and benchmarks for QUuidLiang Qi2011-05-202-2/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing those functions for optimization. Reviewed-by: joao
| | * | | | tst_qhostinfo: Fix IPv6 lookup detection on Windows.Martin Petersson2011-05-201-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the QTcpServer test to init winsock before we use getaddrinfo. Reviewed-by: Shane Kearns
| | * | | | Fix typo in commentOlivier Goffart2011-05-201-1/+1
| | | | | |
| | * | | | Tests for QtConcurrent::map using lambdasOlivier Goffart2011-05-191-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also disable tests with std::vector in c++0x as they do not compile Reviewed-by: Joao
| | * | | | MSVC do not really support initilizer_listOlivier Goffart2011-05-191-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | std::initializer_list exists, but it is not possible to do bracket initialisation Reviewed-by: Joao
| | * | | | Support of lambdas in QtConcurrent::runOlivier Goffart2011-05-196-81/+194
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao
| | * | | | Add QtPrivate::QEnableIfOlivier Goffart2011-05-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for QtConcurrent. Like the new std::enable_if (in c++0x) Reviewed-by: Joao
| | * | | | Fix in-process drag-n-drop of image data, image/* was not available.David Faure2011-05-191-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we give the exact initial QMimeData to the dropEvent, we only get application/x-qt-image as available mimeType. We need to go through QDropData to call xdndObtainData, which can still do some in-process optimization, but there we can do the "saving QImage to the requested format" conversion. Task-number: QTBUG-4110 Merge-request: 860 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-266-19/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: skip the ipv6 Host checking for the moment, since it fails on Windows XP. will fix later remove duplicate message fix "Host" header of ipv6 URLs in QNAM uic: Use QString::fromUtf8 for QUrl properties. uic: #include <QLayout> for QToolBox on non-laid-out forms. add test case for ipv6 url parsing
generated by cgit v0.12 at 2025-02-13 23:23:23 (GMT)