summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-2110-22/+87
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * 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
| * 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-214-13/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | 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
| * | Rewrite autotests for js debuggingAurindam Jana2011-06-141-0/+11
| | | | | | | | | | | | | | | Change-Id: I5cb0e53ceab136bfe7c53a3d6c51c8865b76761b Reviewed-by: kkoehne
| * | Create property cache in case of Component{} rootAaron Kennedy2011-06-101-0/+6
| | | | | | | | | | | | | | | 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-2071-342/+761
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-17323-6340/+9312
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-06-169-138/+257
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: DEF file updates for Symbian QTBUG-19883 Adding top level TRAP for QThreads on Symbian
| * | | | | Undo accidental breakage.David Boddie2011-05-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Undo breakage caused by 3abaecc3aec4e46f1c5969c33875fd45aa542385. Reviewed-by: Kai Koehne
| * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-244271-78546/+74507
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | | | | Fixed breakage caused by b727e5b95c1f0bd308b228fcf0445b42847ae583.David Boddie2011-05-241-13/+0
| | | | | | |
| * | | | | | Doc: Added some details to the accessibility events API documentation.David Boddie2011-05-191-36/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Frederik Gladhorn
| * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-16201-630/+10161
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-128-44/+82
| | | | | | | |
| * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-112-7/+10
| | | | | | | |
| * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-112-8/+8
| | | | | | | |
| * | | | | | | Doc: Applying a pending change from previous merges.David Boddie2011-05-111-0/+4
| | | | | | | |
| * | | | | | | Doc: Fixed qdoc warning.David Boddie2011-05-111-1/+1
| | | | | | | |
| * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-1137-170/+259
| | | | | | | |
| * | | | | | | Doc: Applied pending fixes to API documentation.David Boddie2011-05-1119-68/+90
| | | | | | | |
| * | | | | | | Doc: Documented the value returned when no field can be found.David Boddie2011-05-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19115
| * | | | | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-114-0/+205
| | | | | | | |
| * | | | | | | Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into ↵David Boddie2011-05-0586-1401/+982
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1220
| | * | | | | | | setPeerVerifyMode() and peerVerifyMode() comments fixTaito Silvola2011-05-051-2/+2
| | | | | | | | |
| * | | | | | | | Doc: Fixed incorrect inline snippet for an example .sci file.David Boddie2011-05-041-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18812 (cherry picked from commit 4e8672c87bd7e740b01ca29a2a3c8ba902ed664b)
| * | | | | | | | Doc: Clarified and tidied up OpenGL overlay color documentation.David Boddie2011-05-041-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-701 (cherry picked from commit 664408e1046a4d412662b00f5791a9a2b19fde64)
| * | | | | | | | Doc: Added a code snippet to clarify the use of a function.David Boddie2011-05-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18888 (cherry picked from commit 728d4798fa38abf04c682d955abe6325f7599fa0)
| * | | | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-045-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | | | | | | | | Fix build break in S60 5.0 environmentMiikka Heikkinen2011-06-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19225 Reviewed-by: Sami Merila
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-06-201-5/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Skip softkeys update if application is not on foreground in SymbianMiikka Heikkinen2011-06-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Window deactivation in Qt applications when another application such as task switcher is opened on top of them caused softkeys to display incorrectly for the duration of Qt application being on the background. Task-number: QTBUG-19225 Reviewed-by: Sami Merila
| * | | | | | | | | Revert "Opening taskswitcher, pushes application softkeys to top of switcher"Miikka Heikkinen2011-06-171-5/+3
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 38d04b8cd5a26564945b833450a104fe82d97e14. The above commit was reverted as it caused regression, the problem described in task QTBUG-6115 was reintroduced.
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-06-178-137/+248
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | DEF file updates for Symbianmread2011-06-158-137/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Result of sufficient build, remove_freeze freeze cycles to get Qt urel building cleanly.
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-06-151-1/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | QTBUG-19883 Adding top level TRAP for QThreads on Symbianmread2011-06-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native Symbian implementation of QThread in Qt4.8 does not have a top level TRAP, whereas it did in pthreads based implementation in Qt4.7. This causes an incompatibility in the form of a EUSER-CBASE:66 panic for code that attempts to use the cleanup stack without a TRAP of its own. This adds a top level TRAP and std::exception handler to match it and prints out warning information if they ever trigger to provide some diagnostic information which would otherwise be lost. Task-number: QTBUG-19883 Reviewed-by: Laszlo Agocs
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-06-151-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread" 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
| * | | | | | | | Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"Shane Kearns2011-06-142-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 59f186869c67ab51fccf3aac3153629a1da285b7. Introduced a race condition - QFileInfoGatherer needs a more invasive refactor to solve the thread safety problems.
| * | | | | | | | QFileInfoGatherer: call QFileSystemWatcher addPaths from proper threadShane Kearns2011-06-132-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFSW isn't thread safe. With removal of the thread inside QFSW, the addPaths and removePaths must be called from the thread the QFSW was created in. Reviewed-by: joao
| * | | | | | | | Symbian QFileSystemWatcher: fix potential crashShane Kearns2011-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An address on the stack was being passed to an asynchronous API. This is changed to use the copy of the data on the heap. Reviewed-by: joao
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-144-32/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. Fix a problem where the video would'nt show on some containers QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon.
| * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/4.8'Thierry Bastian2011-05-264255-73896/+73695
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | When asking for relations, don't crash on children that don't return an ↵Frederik Gladhorn2011-05-191-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface. Reviewed-by: Jan-Arve
generated by cgit v0.12 at 2025-02-12 00:58:55 (GMT)