summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed spelling.Robert Griebl2011-01-241-1/+1
| | | | Reviewed-by: TrustMe
* Various small fixes for the QScroller examplesRobert Griebl2011-01-2411-31/+28
| | | | Reviewed-By: TrustMe
* Use qreal everywhere to avoid double/float errors on embedded platforms.Robert Griebl2011-01-241-9/+9
| | | | Reviewed-by: Ralf Engels
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-01-243-207/+233
|\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed overshooting with a very low start velocity. Fix Xrandr DPI calculation for NVidia TwinView. Review and improve scroller documentation Improve overshooting behaviour
| * Fixed overshooting with a very low start velocity.Robert Griebl2011-01-242-71/+87
| | | | | | | | | | | | | | | | | | | | | | Before this patch, the slow down (overshoot) was a separate scroll segment. This could lead to an actual acceleration when going into overshoot with a very low velocity. The new approach is to just continue with the normal scroll segment, until the max overshoot distance is reached and only add one additional segment for the bounce-back animation to complete the overshoot animation. Reviewed-by: Ralf Engels
| * Fix Xrandr DPI calculation for NVidia TwinView.Robert Griebl2011-01-241-2/+11
| | | | | | | | | | | | | | The problem is that a Xinerama 'screen' (as used by QDesktopWidget) does NOT correspond to a Xrandr 'screen', so we have to convert via the root windows. Reviewed-by: Ralf Engels
| * Review and improve scroller documentationRalf Engels2011-01-242-129/+127
| |
| * Improve overshooting behaviourRalf Engels2011-01-241-11/+14
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-245-5/+10
|\ \ | |/ |/| | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add comctl32 v6 assembly dependency to applications only (not libraries)
| * Add comctl32 v6 assembly dependency to applications only (not libraries)miniak2011-01-245-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | This improves the patch from merge request #2526 to add the comctl32 v6 assembly dependency to applications only, as it was being done previously (although only when /SUBSYSTEM:WINDOWS, not when /SUBSYSTEM:CONSOLE). Other existing makespecs are not affected, as they still have all flags in QMAKE_LFLAGS, and QMAKE_LFLAGS_EXE is simply empty. Merge-request: 1020 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-213-20/+94
|\ \ | |/ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QPainterPath: Ignore calls with NaN/Infinite parameters Doc: Fixing typo
| * QPainterPath: Ignore calls with NaN/Infinite parametersAdemar de Souza Reis Jr2011-01-212-19/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPainterPath can't handle NaNs/Inf inside coordinates, but instead of safely ignoring or aborting an operation, it shows a warning and keeps going on, with undefined behavior. Sometimes leading to infinite loops, leaks or crashes (see qtwebkit example below). This is particularly bad when QPainterPath is used to render content from untrusted sources (web or user data). As an example, there's a qtwebkit bug where the browser crashes when a particular SVG is loaded: https://bugs.webkit.org/show_bug.cgi?id=51698. Please note that "untrusted sources" doesn't apply only to network sources. This behavior can probably be exploited on applications such as file-browsers with previews enabled. Task-number: QTBUG-16664 Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org> Merge-request: 1026 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Doc: Fixing typoSergio Ahumada2011-01-211-1/+1
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-01-213-0/+369
|\ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Added initial set of .pkg files for Symbian SIS generation Allow hard-coding the Unix temp path QtScript: add more tests to QObject binding QScriptValueIterator: fix iterateArray and iterateString tests Use file names in header include guards instead of namespace names
| * Merge remote branch 'qt-releng-review/master'Eckhart Koppen2011-01-213-0/+369
| |\ |/ /
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-207-92/+634
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Added initial set of .pkg files for Symbian SIS generation Allow hard-coding the Unix temp path QtScript: add more tests to QObject binding QScriptValueIterator: fix iterateArray and iterateString tests Use file names in header include guards instead of namespace names
| | * Added initial set of .pkg files for Symbian SIS generationEckhart Koppen2011-01-203-0/+369
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Allow hard-coding the Unix temp pathHarald Fernengel2011-01-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This came as a requirement from a device manufacturer that couldn't agree whether tmp is /var/tmp or /tmp, which lead to all kinds of side effects. QSharedMemory token generation was broken depending on where TMPDIR pointed to. This patch allows hard-coding a Qt-wide temp-dir in qplatformdefs. Reviewed-by: Robert Griebl
| | * QtScript: add more tests to QObject bindingCaio Marcelo de Oliveira Filho2011-01-201-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a few more tests to exercise dynamic properties and child objects as properties of QObject binding. Some of these were implicitly tested elsewhere, but is good to have the "properties" clearly stated in our test suite. Reviewed-by: Jedrzej Nowacki
| | * QScriptValueIterator: fix iterateArray and iterateString testsCaio Marcelo de Oliveira Filho2011-01-201-87/+143
| | | | | | | | | | | | | | | | | | | | | | | | This removes the assumption that the properties will be ordered by index and that length will be visited after the indexes, which are not part of QScriptValueIterator API. Reviewed-by: Kent Hansen
| | * Use file names in header include guards instead of namespace namesMartin Pejcoch2011-01-201-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | dumpcpp used "-n" option value for guard macros in headers which was wrong, because that implies that every QtAx COM wrapper must have a unique namespace. Task-number: QTBUG-14383 Reviewed-by: Prasanth
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-197-50/+111
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Fix qmake project in QtScript benchmarks Fixes color property of QComboBox stylesheet Avoid runId clashes Small improvements to host mapping and mismatch report Implemented storing the full set of metadata (platform info) for baselines
| | * Merge remote branch 'qt-master/master'Eckhart Koppen2011-01-197-50/+111
| | |\
* | | \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-01-192-87/+254
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: QtScript: add more tests to QObject binding QScriptValueIterator: fix iterateArray and iterateString tests
| * | | | QtScript: add more tests to QObject bindingCaio Marcelo de Oliveira Filho2011-01-181-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a few more tests to exercise dynamic properties and child objects as properties of QObject binding. Some of these were implicitly tested elsewhere, but is good to have the "properties" clearly stated in our test suite. Reviewed-by: Jedrzej Nowacki
| * | | | QScriptValueIterator: fix iterateArray and iterateString testsCaio Marcelo de Oliveira Filho2011-01-181-87/+143
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This removes the assumption that the properties will be ordered by index and that length will be visited after the indexes, which are not part of QScriptValueIterator API. Reviewed-by: Kent Hansen
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-01-192-5/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Allow hard-coding the Unix temp path Use file names in header include guards instead of namespace names
| * | | | Allow hard-coding the Unix temp pathHarald Fernengel2011-01-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This came as a requirement from a device manufacturer that couldn't agree whether tmp is /var/tmp or /tmp, which lead to all kinds of side effects. QSharedMemory token generation was broken depending on where TMPDIR pointed to. This patch allows hard-coding a Qt-wide temp-dir in qplatformdefs. Reviewed-by: Robert Griebl
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-01-191-5/+7
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Use file names in header include guards instead of namespace names
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-01-181-5/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Use file names in header include guards instead of namespace names
| | | * | | Use file names in header include guards instead of namespace namesMartin Pejcoch2011-01-181-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dumpcpp used "-n" option value for guard macros in headers which was wrong, because that implies that every QtAx COM wrapper must have a unique namespace. Task-number: QTBUG-14383 Reviewed-by: Prasanth
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-01-192-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Fixes color property of QComboBox stylesheet Updated QtCore DEF file for WINSCW and ARMV5
| * | | | | Merge remote branch 'qt-releng-review/master'Eckhart Koppen2011-01-192-0/+8
| |\ \ \ \ \ |/ / / / / / | | | | _ / | | | | /
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-1810502-14695/+19204
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (84 commits) Fixes color property of QComboBox stylesheet Updated QtCore DEF file for WINSCW and ARMV5 qRound: do not do operation with double when qreal is float Fix the warnings when QBasicTimer are member of the ObjectPrivate Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious Fix double click event on Mac OS X. fixed CI gate flagged spelling error: occured -> occurred file rename various fixes to deal with CI gate failures Autotest for QVariant value types Fix memory leak Clarify Component.createObject(null) behavior. Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static Proper fix for QGraphicsItem crash. Fix QSharedMemory and QSystemSemaphore autotests for Symbian Fix QSystemSemaphore handle management issues in Symbian Fix doc typo Document centerIn and fill in the anchors docs Document level of support for QGraphicsObject properties Add an autotest for QVariant method params ...
| | * | | Fixes color property of QComboBox stylesheetMartin Pejcoch2011-01-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the foreground color is displayed correctly when padding is set. Reviewed-by: Olivier
| | * | | Updated QtCore DEF file for WINSCW and ARMV5Eckhart Koppen2011-01-182-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing functions Reviewed-by: TrustMe
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-12133-1655/+4085
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (64 commits) Mac: pixmaps dont treat alpha exactly the same as other platforms Doc: Fixing typo QProcessManager: minor optimization use qBinaryFind instead of bsearch use qBinaryFind instead of bsearch fix two more "comparison between signed and unsigned integer expressions" warnings fix 'QChar::QChar(char)' is deprecated fix another "comparison between signed and unsigned integer expressions" fix warning "comparison between signed and unsigned integer expressions" fix warning "missing braces around initializer for 'in_addr::<anonymous union>'" fix warning "'SeedStorage* randTLS()' defined but not used" remove unused header include make the modifySemaphore() signal-safe on linux fix/stabilizate the year sign change test deal with utcOffset in a correct way handle O_NONBLOCK'ed pipes specific error on write() move POSIX-specific debug to qprocess_unix.cpp Only test control character handling in X11 BM2: Little fix to make the `make check-trusted' to work on Linux and Windows. qmake: fix wrong case label in toString(subSystemOption) ...
* | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-01-182-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Fix qmake project in QtScript benchmarks
| * | | | | Fix qmake project in QtScript benchmarksJedrzej Nowacki2011-01-182-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reasons script.pro file was missing a few benchmarks. QScriptValueIterator benchmark didn't follow naming rules. Reviewed-by: Olivier Goffart
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-185-49/+108
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Avoid runId clashes Small improvements to host mapping and mismatch report Implemented storing the full set of metadata (platform info) for baselines
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2011-01-1810528-15090/+19822
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Avoid runId clashesaavit2011-01-143-20/+32
| | | | | |
| * | | | | Small improvements to host mapping and mismatch reportaavit2011-01-132-8/+10
| | | | | |
| * | | | | Implemented storing the full set of metadata (platform info) for baselinesaavit2011-01-124-22/+67
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-01-181-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Fixes color property of QComboBox stylesheet
| * | | | Fixes color property of QComboBox stylesheetMartin Pejcoch2011-01-181-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | Now the foreground color is displayed correctly when padding is set. Reviewed-by: Olivier
* | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-176-1/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix double click event on Mac OS X. Autotest for QVariant value types Fix memory leak Clarify Component.createObject(null) behavior.
| * \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-176-1/+38
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-171-1/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix double click event on Mac OS X.
| | | * | | | Fix double click event on Mac OS X.Fabien Freling2011-01-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue where the double click would be triggered even with different mouse buttons. Task-number: QTBUG-8222 Reviewed-by: Richard Moe Gustavsen
generated by cgit v0.12 at 2025-09-10 13:16:46 (GMT)