summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-091-1/+1
|
* doc: Fixed some qdoc errors.Martin Smith2010-08-093-3/+4
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0612-41/+123
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Modified descriptions of QBasicTimer class and isActive() function. Translation work for 4.7 Some more french translations. Some french translations doc: Re-introduced next/previous page links in the footer. Doc: Fixing validation bugs Removed duplicate case for const variable snippet. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some S60 qdoc errors. doc: Fixed some missing images. Adding Getting Started files. Auto test passes. Changed width of the document. Part of the fix for QTBUG-12180 Revert "Doc: Adding GS QML example files" Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Adding a description for the Spectrum Analyzer demo. For QTBUG-12180 qdoc: added application flags in doc.pri and fixed QTBUG-12388 ...
| * Modified descriptions of QBasicTimer class and isActive() function.Jerome Pasion2010-08-061-3/+4
| | | | | | | | | | Reviewed by: David Boddie Task: QTBUG-12313
| * Translation work for 4.7Pierre Rossi2010-08-061-1/+1
| | | | | | | | | | | | | | | | validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi
| * doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+3
| |
| * doc: Fixed some qdoc errors.Martin Smith2010-08-061-28/+15
| |
| * doc: Fixed some qdoc errors.Martin Smith2010-08-062-0/+33
| |
| * doc: Fixed some S60 qdoc errors.Martin Smith2010-08-062-0/+54
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-065-7/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
| | * Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-08-061-1/+1
| | |
| | * Move note on connectToBus() not actually being able to reconnect toRobin Burchell2010-08-051-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | connectToBus() documentation, where it belongs. This also fixes some bad English ("make be connected") by means of removing it. Merge-request: 2443 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * QXmlPatterns QAbstractDateTime: only parse 3 digits of time fractionPeter Hartmann2010-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the XML Schema dateTime type allows for an unlimited precision of fractial time values; this fails for 4 or more digits when creating a QTime. This patch takes only 3 digits of the time fraction into account, since we cannot store more in a QTime or QDateTime anyway. Reviewed-by: Olivier Goffart Task-number: QTBUG-11559
| | * Fix link error when building Bearer application with Qt MobilityAlex2010-08-052-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtMobility uses the Qt header when compiling applications which link against Mobility's Bearer library. Therefore QNetworkConfiguration::bearerName() cannot be inline and refer to the new QNetworkConfiguration::bearerTypeName() function (which doesn't exist in Mobility) Task-number: QTBUG-12378 Reviewed-by: Rohan McGovern
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-063-21/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix broken example code Top-level QML item should not have special focus handling. Fix index page Remove some warnings
| * | | Fix broken example codeBea Lam2010-08-061-8/+11
| | | | | | | | | | | | | | | | Task-number: QTBUG-12705
| * | | Top-level QML item should not have special focus handling.Michael Brasser2010-08-061-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's the scene itself that acts as a focus scope, not the top-level item. Task-number: QTBUG-12682 Reviewed-by: Aaron Kennedy
| * | | Remove some warningsMartin Jones2010-08-051-6/+9
| | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-066-4/+48
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245
| * | | Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245Simon Hausmann2010-08-056-4/+48
| | |/ | |/| | | | | | | || <https://webkit.org/b/43530> || [Qt] Input mode states are not reset after entering a password field ||
* | | 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-0512-44/+75
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| * | Improve docs on QML Animation page and associated elementsBea Lam2010-08-057-26/+67
| | | | | | | | | | | | Task-number: QTBUG-12666
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-054-17/+7
| |\ \
| | * | 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
| | * | Make sure onFocusChanged is correctly emitted for items in a FocusScope.Michael Brasser2010-08-052-12/+6
| | |/ | | | | | | | | | | | | 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/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/qt-qml into 4.7Martin Jones2010-08-0578-786/+1066
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-043-1/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-044-2/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fixed crash in concentric circles exampleGunnar Sletta2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the qt_arcs... function will return point_count = 0 when the input rectangle is empty which it is in this case. Because we previously passed 13 there, were passing random memory to downwards in the pipeline, which caused problems. Task: http://bugreports.qt.nokia.com/browse/QTBUG-12516 Reviewed-by: mariusso
| | * | QDeclarativeDebug: use QueuedConnection in the packet protocolOlivier Goffart2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else, we can have deadlock in the javascript debugger, which may start an event loop. If the javascript execution result from some network command, the further network command are not processed more (the ones that exist the javascript debugger event loop) Having a QueuedConnection there means the network events will not be blocked by a rentrency in the event loop Reviewed-by: Lasse Holmstedt
| | * | Implement comp_Source with SSE2 when there is a const alphaBenjamin Poulain2010-08-042-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | On Atom, comp_Source is 280% faster with the SSE2 implementation. Reviewed-by: Andreas Kling
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-041-3/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-043-146/+104
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-042-146/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-041-0/+5
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: 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
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0413-82/+233
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Assistant: Include QML docs Fixed the curve descriptions and added descriptions for overshoot, amplitude, and period. Fix for QTBUG-7940. Cocoa: Showing a QFontDialog first shows it in the bottom-left corner Mac: fix regression from 65a673f that makes some buttons unclickable Fix deadlocks in ICD and NetworkManager engines. new icons for cell and bt networks. Doc: updating getting started docs - not finished Doc: removing empty links in bread crumb add convience methods for getting ethernet service details. fix spelling fix crash try harder to get cell name
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-041-3/+8
| | |\ \ \
| | | * | | Cocoa: Showing a QFontDialog first shows it in the bottom-left cornerRichard Moe Gustavsen2010-08-041-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason it does this, is because we set up a parent child relationship on the dialog. And when doing so, Cocoa shows the dialog. So we need to delay setting up this until after we have set the dialog geometry Task-number: QTBUG-9198 Reviewed-by: prasanth
| | * | | | Fixed the curve descriptions and added descriptions for overshoot, ↵Jerome Pasion2010-08-041-6/+16
| | |/ / / | | | | | | | | | | | | | | | amplitude, and period. Fix for QTBUG-7940.
| | * | | Mac: fix regression from 65a673f that makes some buttons unclickableRichard Moe Gustavsen2010-08-044-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a button has a small gemoetry, the mac style will reender it as flat. Change 65a673f did not take this logic into account when massaging the hit rect of the button. This patch will. Task-number: QTBUG-10401 Reviewed-by: cduclos