summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-222627-16677/+99022
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-06-210-0/+0
| |\ | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-06-2118-215/+1575
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: QDeclarativeDebug: Fix cases where multiple packets arrive in one go Fix build break in S60 5.0 environment Skip softkeys update if application is not on foreground in Symbian Revert "Opening taskswitcher, pushes application softkeys to top of switcher" Fix js debugging autotest on Windows + Add license header Rewrite autotests for js debugging Rename qdeclarativescriptdebugging autotest directory Create property cache in case of Component{} root
| * | \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-2113-24/+95
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Adding debug output for not supported gl features Compile fix in network for ios Make it possible to compile in a screen plugin name in QWS Don't redefine EGL defines Compile fixes in corelib for ios Export IPHONEOS_DEPLOYMENT_TARGET from qmake Adding arm armv6 and armv7 as valid archs for mac builds reset certain global variables on deletion Made tst_QWidget::repaintWhenChildDeleted() pass.
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-2013-24/+95
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Adding debug output for not supported gl features Compile fix in network for ios Make it possible to compile in a screen plugin name in QWS Don't redefine EGL defines Compile fixes in corelib for ios Export IPHONEOS_DEPLOYMENT_TARGET from qmake Adding arm armv6 and armv7 as valid archs for mac builds reset certain global variables on deletion Made tst_QWidget::repaintWhenChildDeleted() pass.
| | | * | Adding debug output for not supported gl featuresIan2011-06-201-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the gl2 paintengine Reviewed-by: Samuel
| | | * | Compile fix in network for iosIan2011-06-203-5/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| | | * | Make it possible to compile in a screen plugin name in QWSIan2011-06-201-0/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| | | * | Don't redefine EGL definesIan2011-06-201-1/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| | | * | Compile fixes in corelib for iosIan2011-06-203-16/+23
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| | | * | Export IPHONEOS_DEPLOYMENT_TARGET from qmakeIan2011-06-202-0/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| | | * | Adding arm armv6 and armv7 as valid archs for mac buildsIan2011-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| | | * | reset certain global variables on deletionLars Knoll2011-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_button_down needs to be reset to 0 if it points to the widget being deleted. Reviewed-by: Samuel
| | | * | Made tst_QWidget::repaintWhenChildDeleted() pass.Samuel Rødal2011-06-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Implement some missing functionality in QWidget::destroy(). (cherry picked from commit 0273bc5d22cd1fa08854b023f9b6c318fc75f3fa)
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-06-2117-207/+1567
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarativeDebug: Fix cases where multiple packets arrive in one go Fix js debugging autotest on Windows + Add license header Rewrite autotests for js debugging Rename qdeclarativescriptdebugging autotest directory Create property cache in case of Component{} root
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-06-212-13/+27
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | master-qml-staging
| | | * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-202-13/+27
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: QDeclarativeDebug: Fix cases where multiple packets arrive in one go
| | | | * | | | QDeclarativeDebug: Fix cases where multiple packets arrive in one goKai Koehne2011-06-202-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure no packets get 'lost' when they're arriving in one go through the TCP/IP socket. Reviewed-by: Christiaan Janssen
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-06-2015-194/+1540
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | master-qml-staging
| | | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-2011-194/+1517
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Fix js debugging autotest on Windows + Add license header Rewrite autotests for js debugging Rename qdeclarativescriptdebugging autotest directory
| | | | * | | | Fix js debugging autotest on Windows + Add license headerKai Koehne2011-06-153-12/+65
| | | | | | | |
| | | | * | | | Rewrite autotests for js debuggingAurindam Jana2011-06-148-111/+1381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5cb0e53ceab136bfe7c53a3d6c51c8865b76761b Reviewed-by: kkoehne
| | | | * | | | Rename qdeclarativescriptdebugging autotest directoryKai Koehne2011-06-144-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align it with the other qdeclarativedebug* tests. Change-Id: Idde1c0948daa10bf4cc893bcd08c99b5c743553a
| | | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-104-0/+23
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Create property cache in case of Component{} root
| | | | * | | | Create property cache in case of Component{} rootAaron Kennedy2011-06-104-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36f969d09d8ce5e0b68b657b514586990e88ebe4 Task-number: QTBUG-19354
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-06-202142-2657/+72389
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (82 commits) Doc: Fixed spelling errors that were blocking the CI system. Added missing license headers. Added missing license headers. Doc: Added missing license headers for documentation and examples. qdoc: Fixed code to match comments in QML files. Fixed API types. Doc: Speculative attempt to fix build breakage. Doc: Fixed file name of a header file to use lower case characters. Doc: Speculative attempt to fix build breakage. Doc: Fixed file name of a header file to use lower case characters. Doc: Fixed links. Doc: Added a snippet to show how to test the Qt version. Added an additional check to workaround an issue on Windows. Doc: Fixed a scope test for maemo5 and made an error a warning instead. converted to unix txt file try to resolve CRLR problems "TAB character in non-leading whitespace" fixed * fixed trailing- and whitespaces * "How To Learn Qt" is almost complete. Last section is missing * Several external and internal (Qt) web links added Undo accidental breakage. Doc: Added some more information about visited links in rich text. ...
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-reviewDavid Boddie2011-06-2010742-169694/+257355
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-06-2012183-277291/+432220
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (1968 commits) Doc: Fixed spelling errors that were blocking the CI system. Added missing license headers. DEF file updates for Symbian QTBUG-19883 Adding top level TRAP for QThreads on Symbian Added missing license headers. Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread" Fix alignment value not handled in ODF Silence a compiler warning about unhandled enum in switch Silence the "array out of bounds" warning in GCC 4.6. Silence the callgrind warnings in our source code when using gcc 4.6 Create a function that merges the SSE common code Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction Revert "Fix compilation of lrelease on Windows" QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread Also test http proxy in the QTcpServer benchmark Symbian QFileSystemWatcher: fix potential crash Enable QTcpServer benchmark on symbian Fix building the OpenVG graphicssystem on Linux with static libs fix build on windows 7 Fix compilation of lrelease on Windows ...
| | | | * | | | | | Doc: Fixed spelling errors that were blocking the CI system.David Boddie2011-06-201-2/+2
| | | | | | | | | |
| | | | * | | | | | Added missing license headers.David Boddie2011-06-173-0/+120
| | | | | | | | | |
| | | | * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-17495-9363/+20888
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| | | | * | | | | | | Added missing license headers.David Boddie2011-06-153-0/+120
| | | | | | | | | | |
| | | | * | | | | | | Doc: Added missing license headers for documentation and examples.David Boddie2011-06-08179-55/+7015
| | | | | | | | | | |
| | | | * | | | | | | Merge branch '4.8'David Boddie2011-06-083-7/+13
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | qdoc: Fixed code to match comments in QML files. Fixed API types.David Boddie2011-06-082-7/+6
| | | | | | | | | | | |
| | | | | * | | | | | | Doc: Speculative attempt to fix build breakage.David Boddie2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case sensitivity problems strike again.
| | | | | * | | | | | | Doc: Fixed file name of a header file to use lower case characters.David Boddie2011-06-081-1/+1
| | | | | | | | | | | |
| | | | | * | | | | | | Doc: Added a snippet to show how to test the Qt version.David Boddie2011-06-031-0/+7
| | | | | | | | | | | |
| | | | * | | | | | | | Doc: Speculative attempt to fix build breakage.David Boddie2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case sensitivity problems strike again.
| | | | * | | | | | | | Doc: Fixed file name of a header file to use lower case characters.David Boddie2011-06-071-1/+1
| | | | | | | | | | | |
| | | | * | | | | | | | Doc: Fixed links.David Boddie2011-06-072-2/+2
| | | | | | | | | | | |
| | | | * | | | | | | | Merge branch '4.8'David Boddie2011-06-011-1/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint
| | | | * | | | | | | | Merge branch '4.8'David Boddie2011-05-272-2/+2
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Doc: Fixed a scope test for maemo5 and made an error a warning instead.David Boddie2011-05-272-2/+2
| | | | | | | | | | | |
| | | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-05-273-76/+401
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | converted to unix txt fileVladimir Minenko2011-05-261-218/+218
| | | | | | | | | | | | |
| | | | | * | | | | | | | try to resolve CRLR problemsVladimir Minenko2011-05-261-3/+2
| | | | | | | | | | | | |
| | | | | * | | | | | | | "TAB character in non-leading whitespace" fixedVladimir Minenko2011-05-261-45/+43
| | | | | | | | | | | | |
| | | | | * | | | | | | | * fixed trailing- and whitespacesVladimir Minenko2011-05-262-76/+91
| | | | | | | | | | | | |