summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0649-450/+1139
|\ | | | | | | | | Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| * Remove the definition of QT_HAVE_NEON from qt.prfBenjamin Poulain2010-08-063-3/+6
| | | | | | | | | | | | | | | | Since we cannot use NEON and VFP concurrently, it is better not to force neon all over the place :) Reviewed-by: Andreas Kling Reviewed-by: Thiago Macieira
| * Use the fast Neon conversion for converting colors of jpeg images.Benjamin Poulain2010-08-061-2/+9
| | | | | | | | Reviewed-by: Andreas Kling
| * Do the conversion from RGB888 to RGB32 using NeonBenjamin Poulain2010-08-063-0/+123
| | | | | | | | | | | | | | | | Doing the conversion with Neon is 700% faster. Help by Thiago Macieira on vacation. Reviewed-by: Thiago Macieira
| * Move the build of Neon file from painting.pri to gui.proBenjamin Poulain2010-08-062-18/+21
| | | | | | | | | | | | | | Move the build operation of files using Neon from painting.pri to gui.pro. This will make easier to add Neon files in the future. Reviewed-by: Andreas Kling
| * QSharedPointer documentation: specify that it is not safe to operate on the ↵Olivier Goffart2010-08-061-2/+2
| | | | | | | | | | | | | | same object in different threads Task-number: QTBUG-12700 Reviewed-by: thiago
| * compilation with QT_NO_DEPRECATEDOlivier Goffart2010-08-061-0/+2
| | | | | | | | Reviewed-by: Andreas Kling
| * Test we do not have compiler warnings in our headers with more optionsOlivier Goffart2010-08-061-2/+5
| | | | | | | | | | | | I removed some statics because else the test could not be run several times Reviewed-by: Andreas Kling
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-069-54/+103
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>"
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-056-100/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove the memory tracking attempt from the runtime graphics system.
| | * | Remove the memory tracking attempt from the runtime graphics system.Jason Barron2010-08-056-100/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been decided that this logic will not be used by anyone at the moment so let's remove it. This removes an exported (although private) virtual function so breaks binary compatiblity for plugins built with previous versions. Reviewed-by: Jani Hautakangas
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-0530-325/+963
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rename example component file for clarity Improve docs on QML Animation page and associated elements Fix warning from whining complier. Re-enable script program caching on Symbian (used to be disabled due to crash problems that no longer occur). Increase drag distance on Symbian to improve finger usability on capacitive screens Increase maximum heap size of QML Viewer Add missing test file. Make sure onFocusChanged is correctly emitted for items in a FocusScope.
| | * | | Rename example component file for clarityBea Lam2010-08-054-8/+22
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12633
| | * | | Improve docs on QML Animation page and associated elementsBea Lam2010-08-0518-298/+843
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12666
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-057-18/+97
| | |\ \ \
| | | * | | Re-enable script program caching on Symbian (used to be disabled due to ↵Joona Petrell2010-08-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crash problems that no longer occur). Task-number: QTBUG-12599 Reviewed-by: Martin Jones
| | | * | | Increase drag distance on Symbian to improve finger usability on capacitive ↵Joona Petrell2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screens Task-number: QTBUG-12594 Reviewed-by: Martin Jones
| | | * | | Increase maximum heap size of QML ViewerJoona Petrell2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12029 Reviewed-by: Martin Jones
| | | * | | Add missing test file.Michael Brasser2010-08-051-0/+33
| | | | | |
| | | * | | Make sure onFocusChanged is correctly emitted for items in a FocusScope.Michael Brasser2010-08-053-12/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12649 Reviewed-by: Martin Jones
| | * | | | Fix warning from whining complier.Martin Jones2010-08-051-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12473 Reviewed-by: Aaron Kennedy
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-051-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed incorrect include/Qt/qconfig.h in binary packages.
| | * | | | Fixed incorrect include/Qt/qconfig.h in binary packages.Rohan McGovern2010-08-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building from a source package, src/corelib/global/qconfig.h exists. syncqt contained logic to force the creation of include/Qt/qconfig.h for the case where it _doesn't_ exist. This meant that running syncqt from a Qt source package resulted in include/Qt/qconfig.h including qconfig.h twice. Task: QTBUG-12637 Reviewed-by: Toby Tomkins
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-051-0/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: dont leak these
| | * | | | dont leak theseLorn Potter2010-08-051-0/+1
| | |/ / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-051-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | QStyleSheet documentation: QMenu's tear-off is styled with ::tearoffOlivier Goffart2010-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12553 Reviewed-by: Carlos Duclos
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0557-881/+3020
|\ \ \ \ \ | |/ / / /
| * | | | Fix QTextEngine overflow caused by extremely long textJiang Jiang2010-08-053-33/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally, QTextEngine use int to calculate most of the layout data required. If a string longer than 2^24 is passed into either QTextEngine or classes using it (QStackTextEngine, QPainter, QFontMetrics, etc.), overflow will happen because the memory size required to allocate for layout will become too large for int to handle. This patch will prevent these cases and add error handling mechanism for relevant code. Task-number: QT-3658 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | | Replace the SSE prologues by a macroBenjamin Poulain2010-08-053-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the code of the SSE prologue by a macro to avoid copying the prologue everywhere. Reviewed-by: Andreas Kling
| * | | | QDom: Do not crash on "<a:>text</a:>"Frank Osterfeld2010-08-052-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "a:" is not a valid tagname. The function creating the element node notices that and returns 0, but the parser ignores it and continues, and then crashes later when processing the "text". This patch aborts the parsing immediately when creating the element node failed and fixes the crash. Merge-request: 2431 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-051-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix crash when all visible items inluding currentIndex have been removed.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-05162-1873/+4020
| | |\ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0414-93/+129
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the remote command delimiter, this has cahnged at some point. Assistant: Revert previous commit, issue was already fixed. fix line endings fix compilation with -plugin-kbd-* Fix typo in docs Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Fix compilation with QT_NO_DBUS fix inaccurate comment
| | * | Fix the remote command delimiter, this has cahnged at some point.kh12010-08-043-3/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck
| | * | Assistant: Revert previous commit, issue was already fixed.ck2010-08-041-2/+1
| | | |
| | * | fix line endingsOswald Buddenhagen2010-08-043-82/+82
| | | |
| | * | fix compilation with -plugin-kbd-*Oswald Buddenhagen2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it certainly is not such a good idea to write mouse when one means kbd ... Task-number: QTBUG-12483
| | * | Fix typo in docsAnders Bakken2010-08-041-2/+2
| | | | | | | | | | | | | | | | | | | | Merge-request: 2446 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-044-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistent with QT_LFLAGS_* for other database drivers. Support added to configure shell script and configure.exe. Respect SYBASE and SYBASE_LIBS. Use QT_LFLAGS_TDS in project files. Merge-request: 2416 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Fix compilation with QT_NO_DBUSTasuku Suzuki2010-08-042-0/+12
| | | | | | | | | | | | | | | | | | | | Merge-request: 2441 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | fix inaccurate commentOswald Buddenhagen2010-08-041-1/+1
| | | | | | | | | | | | | | | | qtmultimedia doesn't need gstreamer. inspired by MR 762.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-045-2/+69
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed crash in concentric circles example QDeclarativeDebug: use QueuedConnection in the packet protocol Implement comp_Source with SSE2 when there is a const alpha
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-0410-26/+346
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add support for -runtimegraphicssystem configure option runonphone - catch ctrl-c and terminate remote process before exit Skipped rcomp check on Raptor. Fix package header in cases where VERSION doesn't contain all values
| | * | | | Add support for -runtimegraphicssystem configure optionJason Barron2010-08-044-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been requested that we provide a configuration option to specify the default "inner" graphics system that should be used when the runtime graphics system is in use. The argument specified to the option is written to the qconfig.h as QT_DEFAULT_RUNTIME_SYSTEM and this is used to instantiate the default graphics system that will be used by the runtime graphics system. Reviewed-by: Gunnar Sletta
| | * | | | runonphone - catch ctrl-c and terminate remote process before exitShane Kearns2010-08-045-2/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trap SIGINT, SIGTERM, SIGHUP, SIGBREAK, SIGQUIT On receiving one of these signals, we first untrap them (so runonphone can be killed by a 2nd ctrl-c if needed), and send a terminate to the TRK launcher. This will kill the remote process if it's running, then disconnect from TRK cleanly. Task-number: QTBUG-12444 Reviewed-by: axis
| | * | | | Skipped rcomp check on Raptor.axis2010-08-041-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary in the case where Qt is built as part of the platform, where configure will run before all the tools are built. RevBy: Thomas Zander
| | * | | | Fix package header in cases where VERSION doesn't contain all valuesMiikka Heikkinen2010-08-041-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing minor or patch value from VERSION caused malformed pkg header to be generated. Task-number: QTBUG-12617 Reviewed-by: axis
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-047-148/+222
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make SpringAnimation usable inside a transition Don't crash if an item is removed from the scene while it is gaining focus. Add missing snippet file Snake game cannot be restarted
| | * | | | Make SpringAnimation usable inside a transitionmae2010-08-044-146/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpringFollow was turned into SpringAnimation so it could be used inside a Behavior. This patch completes the work and makes it usable inside a transition. This is the documented behavior of SpringAnimation, the patch is essential to make SpringAnimation work consistently. Reviewed-by: Michael Brasser Task-number: QTBUG-12141
generated by cgit v0.12 at 2025-02-07 01:31:52 (GMT)