summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* don't reallocate memory if the old buffer has sufficient capacityRitt Konstantin2011-06-061-8/+11
| | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* fix potential memory leakingRitt Konstantin2011-06-061-8/+19
| | | | | | | | | | the `memsize` member was never set with anything but 0; so, the memory newer was freed neither in destructor, neither in releaseSurface(). for the first one it was non-critical because of the memory was freed indirectly - by hiding widget before closing (which is why the issue wasn't catched-up until now) Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* don't delete the lock if it was not created by this surfaceRitt Konstantin2011-06-061-2/+6
| | | | | | | and don't forget about it otherwise Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* QSessionManager: fix build on QWSRitt Konstantin2011-06-061-0/+3
| | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* 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 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-2726-278/+770
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * Merge remote-tracking branch 'earth-staging/master'Olivier Goffart2011-05-263-18/+12
| |\
| | * 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-268-76/+52
| |\ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-244256-73821/+73652
| |\ \
| * | | 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-2410-51/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | 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-202-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-202-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix typo in commentOlivier Goffart2011-05-201-1/+1
| | | |
| * | | 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-195-81/+127
| | | | | | | | | | | | | | | | 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-264-3/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | fix "Host" header of ipv6 URLs in QNAMshiroki2011-05-251-1/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | | | uic: Use QString::fromUtf8 for QUrl properties.Friedemann Kleint2011-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As otherwise the compilation of ui_-files fails when using QT_NO_CAST_FROM_ASCII. Bug reported on mailing list. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
| * | | | uic: #include <QLayout> for QToolBox on non-laid-out forms.Friedemann Kleint2011-05-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the fake tab-spacing property, which accesses the internal layout and sets its spacing. Task-number: QTBUG-19339 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-2611-697/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: DeclarativeObserver: Removed the SubcomponentEditorTool QDeclarativeDebug: Fix autotest on Windows/MSVC Fix QtDeclarative keyinteraction example
| * | | | | DeclarativeObserver: Removed the SubcomponentEditorToolThorbjørn Lindeijer2011-05-2411-697/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tool made selecting items in your QML app more complicated than necessary. Now, left-click will always just select the top-most item under the mouse and right-click will allow you to select any of the items below. Also, the highlighted bounding rect now always applies to just one item, instead of also including the children bounding rect. Reviewed-by: Kai Koehne Change-Id: I17b5ab397d951fd68711590469ca6e723a9cb0e6
| * | | | | Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-244334-90939/+107401
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-258-76/+52
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-248-76/+52
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarativeDebug: Fix autotest Pass QList as const reference when possible Fixed crashes in Observer mode related to infinite bounding rects Doc QmlDirParser: Fix typeInfo accessor.
| | * | | | Merge remote branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-05-238-76/+52
| | |\ \ \ \ | | | |/ / /
| | | * | | Pass QList as const reference when possibleThorbjørn Lindeijer2011-05-173-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids some reference counting. Reviewed-by: Kai Koehne Change-Id: I4de83aa4df6833fa2287ac1854bbb0052d15cee9
| | | * | | Fixed crashes in Observer mode related to infinite bounding rectsThorbjørn Lindeijer2011-05-173-67/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fixed by avoiding uniting or subtracting QPolygonF with potentially infinite coordinates. The LiveSelectionIndicator now uses a QGraphicsRectItem rather than a QGraphicsPolygonItem and displays only the boundaries of selected objects, not including their children. The SubcomponentMaskLayerItem now works with rectangles and uses a QRegion to determine the area around the current context, converting this to a polygon only as a last step. Reviewed-by: Kai Koehne Task-number: QTCREATORBUG-4559 Change-Id: I266f5387fa67017fc50215282a95b4ee6498be6d
| | | * | | DocAaron Kennedy2011-05-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25f1885ef285fb3bd14c1f499b9f42e38bba5ec6 Task-number: QTBUG-19265
| | | * | | QmlDirParser: Fix typeInfo accessor.Kai Koehne2011-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
generated by cgit v0.12 at 2025-01-30 13:34:01 (GMT)