summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-102-0/+7
| | | | | | | | | This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore <rich@kde.org> Task-number: QT-3704
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-102-0/+19
|\
| * Mac: Fix crash when using style to draw on other things than widgetsRichard Moe Gustavsen2010-08-101-0/+3
| | | | | | | | | | | | | | | | When drawing a complex control using the style, you are allowd to skip giving a widget as the last argument. But when doing so, it caused a crash in the mac style. Reviewed-by: Fabien Freling
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-1025-61/+127
| |\
| * | Doc: Adding radius support for CSS3 and webkitMorten Engvoldsen2010-08-101-0/+16
| | |
* | | doc: Some reorganization of top page topic hierarchy.Martin Smith2010-08-107-18/+17
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1083-4819/+10440
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression add performance comparisons to qregexp benchmark configure: fix error message when calling config.status Fix invalid memory write during recursive timer activation Added comment about calendarPopup in setCalendarWidget function documentation. doc: Fixed some qdoc errors. Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE. XmlListModel doc fixes Mention QML_IMPORT_TRACE in Modules docs Merge sections about when property and default state Explain Flipable example further PathView required some diagonal movement before a drag was initiated. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0. doc: Fixed some qdoc errors. Add Ukrainian translation. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. ...
| * Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regressionBradley T. Hughes2010-08-101-1/+1
| | | | | | | | | | | | | | Commit eea84818e98af917d3cf2bf04ea17a416ef9d55e corrected some spelling mistakes, one of which this test was relying on. Reviewed-by: trustme
| * add performance comparisons to qregexp benchmarkArvid Ephraim Picciani2010-08-103-1/+320
| | | | | | | | Reviewed-by: hjk
| * configure: fix error message when calling config.statusJoerg Bornemann2010-08-091-1/+1
| | | | | | | | | | | | | | | | Calling configure in a shadow build directory led to error messages when trying to delete the content of $$QT_BUILD_TREE/mkspecs. Task-number: QTBUG-12764 Reviewed-by: ossi
| * Fix invalid memory write during recursive timer activationBradley T. Hughes2010-08-093-20/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handler for one timer recurses the event loop, and the handler for another timer removes the first timer, returning from the recursion and the handler for the first timer causes an invalid write (since the timer info for the first timer has been deleted). Fix this by keeping an active reference in QTimerInfo (instead of just a bool inTimerEvent). If this is non-zero, the timer is currently being delivered, so we prevent more delivery. When a timer is removed and it's activateRef is set, we clear it so that the delivery code knows now to write to memory that's already been freed. A side effect of this change is that we no longer need to track the currentTimerInfo "globally" anymore, it can be a normal local variable in the QTimerInfoList::activateTimers() function. Task-number: QT-3553 Reviewed-by: olivier Reviewed-by: joao
| * Added comment about calendarPopup in setCalendarWidget function documentation.Jerome Pasion2010-08-091-0/+1
| | | | | | | | | | Reviewer: David Boddie Task: QTBUG-12300
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-0945-87/+134
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-0932-87/+9801
| | |\
| | | * CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.Carlos Manuel Duclos Vergara2010-08-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That code is deprecated for the most part, however under certain circumstances could be run. The fix is to check the value when using the deprecated code and change the return value to follow the logic of the new code. Task-number: QTBUG-12732 Reviewed-by: João Abecasis
| | | * XmlListModel doc fixesBea Lam2010-08-091-1/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-12749
| | | * Mention QML_IMPORT_TRACE in Modules docsBea Lam2010-08-091-0/+8
| | | |
| | | * Merge sections about when property and default stateBea Lam2010-08-091-36/+59
| | | |
| | | * Explain Flipable example furtherBea Lam2010-08-091-4/+10
| | | |
| | | * PathView required some diagonal movement before a drag was initiated.Martin Jones2010-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Any movement beyond the threshold is sufficient. Task-number: 12747 Reviewed-by: Joona Petrell
| | * | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-0939-45/+45
| | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
| * | | doc: Fixed some qdoc errors.Martin Smith2010-08-093-9/+8
| | | |
| * | | doc: Fixed some qdoc errors.Martin Smith2010-08-091-1/+1
| | |/ | |/|
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-2/+2
| |\ \
| | * | OpenGL: Fix multisample renderbuffer creation when MAX_SAMPLES is 0.Christian Kamm2010-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we would try to create one with samples = 1 anyway, potentially resulting in an INVALID_VALUE error. Task-number: QTBUG-12757 Reviewed-by: Samuel Rødal
| * | | doc: Fixed some qdoc errors.Martin Smith2010-08-092-7/+1
| |/ /
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-096-0/+9667
| |\ \
| | * | Add Ukrainian translation.Victor Ostashevsky2010-08-096-0/+9667
| | | | | | | | | | | | | | | | | | | | Merge-request: 761 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | doc: Fixed some qdoc errors.Martin Smith2010-08-093-4/+4
| |/ /
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-098-17/+22
| | |
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-4/+4
| |\ \
| | * | Doc: removing reduntant text from the index pageMorten Engvoldsen2010-08-091-4/+4
| | | |
| * | | doc: Fixed some qdoc errors.Martin Smith2010-08-094-5/+5
| |/ /
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-091-1/+1
| |\ \ | | |/
| | * Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750Jerome Pasion2010-08-091-1/+1
| | |
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-095-6/+7
| |/
| * doc: Fixed some qdoc errors.Martin Smith2010-08-091-63/+1
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-095-4629/+278
| |\
| | * I18N: Update German translations for 4.7.0.Friedemann Kleint2010-08-095-4629/+278
| | |
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-091-6/+11
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-1024-61/+126
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Pending surface might not get destroyed if no flush() happens Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
| * | Pending surface might not get destroyed if no flush() happensJani Hautakangas2010-08-093-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | in between graphics system change. This patch ensures that all old surfaces are destroyed before new graphics system is activated. Reviewed-by: Jason Barron
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-0922-45/+117
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-0622-45/+117
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-0622-45/+117
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename Symbian generated mmp/mk files to include target in filename Use ARGB32 premultiplied backing store format in Symbian^3 Register window types for Symbian system effects Added $$MW_LAYER_SYSTEMINCLUDE to some autotests Fix duplicate binary names issues in Symbian autotests Fix some autotest deployments to work in case Qt is already deployed Fix run and runonphone targets for projects that have TARGET with path
| | | | * Rename Symbian generated mmp/mk files to include target in filenameMiikka Heikkinen2010-08-064-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mmp and mk files previously contained UID3 as unique identifier in the filename. However, this was not particularly useful for building subprojects in massive project trees such as Qt, as it was difficult to remember UID for each subproject. Now with intuitive naming of mmps, it is possible to build a subproject like this: sbs -c armv6_urel -p qtcore_dll.mmp Task-number: QTBUG-12715 Reviewed-by: Jason Barron
| | | | * Use ARGB32 premultiplied backing store format in Symbian^3Jani Hautakangas2010-08-062-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raster paint engine for translucent windows. Task-number: QTBUG-12710 Reviewed-by: Jason Barron
| | | | * Register window types for Symbian system effectsJani Hautakangas2010-08-063-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the purpose of the window (dialog/popup/child window etc...). Notify WServ when modal window is shown/hidden Notify WServ when temporary surface deallocation happens. Notify WServ when the application is going to shutdown. Task-number: QT-2027 Reviewed-by: Jason Barron
| | | | * Added $$MW_LAYER_SYSTEMINCLUDE to some autotestsMiikka Heikkinen2010-08-063-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These autotests couldn't find e32svr.h in Symbian^3 env because that header has moved. Reviewed-by: TrustMe
| | | | * Fix duplicate binary names issues in Symbian autotestsMiikka Heikkinen2010-08-067-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian each binary name must be unique as all binaries are stored in the same directory on the device. Some autotests created helper binaries that had same names on different tests, which caused build and installation issues when building entire autotest project tree. Reviewed-by: Shane Kearns