summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes a crash when setting focus on a widget with a focus proxy.Denis Dzyubenko2010-01-062-6/+50
| | | | | | | When the focus proxy widget doesn't have InputMethodEnabled attribute set we shouldn't try to set an input context on it. Reviewed-by: Simon Hausmann
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-0618-72/+262
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-061-1/+1
| |\
| | * Remove warning "statement with no effect"Thiago Macieira2010-01-061-1/+1
| | | | | | | | | | | | Reviewed-By: TrustMe
| * | doc: Clarified activeSubControls and subControls.Martin Smith2010-01-061-4/+6
| |/ | | | | | | Task-number: QTBUG-6405
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0618-93/+283
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0644-436/+654
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Fix QT_NO_CONTEXTMENU Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe ) Fix license check failure. QHttpSocketEngine: Remove unneeded code doc: Clarified that .lnk files are System files on Windows. doc: Clarified that the scene owns its items and destroys them. QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUG QAbstractSocket: Warn when wrong QHostInfo was received doc: Fixed references to currsor position(). Prevent a crash when creating an inputContext from the QApplication dtor. doc: Added some missing macro descriptions. Small optimization in QIODevice::readAll() doc: Added note explaining grabMouse() for Cocoa and Carbon. doc: Replaced usses of rootState() with state machine pointer. doc: Fixed typo. doc: Clarified which values were added in Qt 4.4. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf ) doc: Clarified next and previous activation order. Fix typo in QFSFileEnginePrivate::canonicalized tst_qhostinfo benchmark: Fix license header ...
| | | * Fix QT_NO_CONTEXTMENUKent Hansen2010-01-061-0/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-6474
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-064-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe ) Changes in WebKit/qt since the last update:
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-0611-60/+229
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed Symbian application deployment instructions Fixed "run" makefile target documentation for Symbian Minor logic fix to Symbian generator in qmake Deal with test cases that crash or hang Updated sis file names and related content in Symbian installation docs
| | | * | Fixed Symbian application deployment instructionsMiikka Heikkinen2010-01-052-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obsolete sis files were referenced. Task-number: QTBUG-6601 Reviewed-by: Janne Koskinen
| | | * | Fixed "run" makefile target documentation for SymbianMiikka Heikkinen2010-01-052-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "run" target no longer is just for running emulator targets. Also added TRK for optional requirements. Reviewed-by: axis
| | | * | Minor logic fix to Symbian generator in qmakeMiikka Heikkinen2010-01-051-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include meant to be under restore_build was getting included always. This is actually how it should work, so removed the empty restore_build target entirely. Reviewed-by: Janne Anttila
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-048-45/+207
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Deal with test cases that crash or hang Updated sis file names and related content in Symbian installation docs
| | | * | Deal with test cases that crash or hangShane Kearns2010-01-046-33/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an optional timeout to runonphone - the application will be killed after this time. Used when autotesting unattended, as some tests can hang. Handled the just in time debug halting the application when it is about to crash, by terminating the application. In future, we could capture a call stack or something here. Also added quiet/verbose options to control the amount of output from runonphone. Reviewed-by: Janne Koskinen
| | | * | Updated sis file names and related content in Symbian installation docsMiikka Heikkinen2010-01-042-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6348 Reviewed-by: Janne Koskinen
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-044-63/+87
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove the need to know the service owner when adding/removing signal rules. Use the watched service name list in matching incoming signals too. Change the QtDBus watched service list to a map to its owner. Update debug output to show the connection's ptr and thread
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0116-134/+480
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update the scrolling code of FlickCharm Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 ) Symbian build fix Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c07df5686b431aa5d11643d00308d8f8f59d88b1 ) For maemo, do not strip the binaries during the installation. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| * | | | | | doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6615
* | | | | | | Update copyright year to 2010Jason McDonald2010-01-068857-8927/+8927
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Fix license check failure.Jason McDonald2010-01-062-26/+28
|/ / / / / | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-062-18/+4
|\ \ \ \ \
| * | | | | QHttpSocketEngine: Remove unneeded codeMarkus Goetz2010-01-062-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a buffer that is always empty since it was only used for parsing the HTTP proxy protocol, not the actual socket data. Reviewed-by: Peter Hartmann
* | | | | | doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-3/+4
|/ / / / / | | | | | | | | | | | | | | | Task-number: QTBUG-6615
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-061-9/+13
|\ \ \ \ \
| * | | | | QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUGMarkus Goetz2010-01-061-9/+9
| | | | | |
| * | | | | QAbstractSocket: Warn when wrong QHostInfo was receivedMarkus Goetz2010-01-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's see if this happens. Reviewed-by: Thiago
* | | | | | doc: Clarified that the scene owns its items and destroys them.Martin Smith2010-01-061-11/+17
|/ / / / / | | | | | | | | | | | | | | | Task-number: QTBUG-6637
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-063-14/+18
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.5' into 4.6-stagingThiago Macieira2010-01-051-13/+15
| |\ \ \ \ \
| | * | | | | tst_qhostinfo benchmark: Fix license headerMarkus Goetz2010-01-041-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, I got it wrong. Reviewed-by: TrustMe
| * | | | | | Prevent a crash when creating an inputContext from the QApplication dtor.Denis Dzyubenko2010-01-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing the global input context from the QWidget destructor access it directly instead of calling a helper function. Don't even bother to create an input context if QApplication is being destroyed (just in case if the user is calling the QApplication::inputContext manually from the destructor). Task-number: QTBUG-7105 Reviewed-by: Simon Hausmann
* | | | | | | doc: Fixed references to currsor position().Martin Smith2010-01-061-26/+29
|/ / / / / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6763
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-052-2/+51
|\ \ \ \ \ \
| * | | | | | Small optimization in QIODevice::readAll()Markus Goetz2010-01-052-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. and more testcases Reviewed-by: joao
* | | | | | | doc: Added some missing macro descriptions.Martin Smith2010-01-051-4/+27
|/ / / / / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6769
* | | | | | doc: Added note explaining grabMouse() for Cocoa and Carbon.Martin Smith2010-01-051-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6810
* | | | | | doc: Replaced usses of rootState() with state machine pointer.Martin Smith2010-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The root state of a QStateMachine is now the state machine itself. Task-number: QTBUG-6907
* | | | | | doc: Fixed typo.Martin Smith2010-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6978
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-053-2/+22
|\ \ \ \ \ \
| * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-053-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf ) Changes in WebKit/qt since the last update: * Prospective build fix for IA64 Task: QTBUG-6948
* | | | | | | doc: Clarified which values were added in Qt 4.4.Martin Smith2010-01-051-8/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7118
* | | | | | doc: Clarified next and previous activation order.Martin Smith2010-01-051-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6992
* | | | | | Fix typo in QFSFileEnginePrivate::canonicalizedMarkus Goetz2010-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0413-244/+296
|\ \ \ \ \ \
| * | | | | | tst_qtcpserver: Move benchmarksMarkus Goetz2010-01-044-156/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move benchmarks into tests/benchmarks directory. Reviewed-by: Thiago
| * | | | | | Cocoa: added release poolRichard Moe Gustavsen2010-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning given by cocoa (cherry picked from commit 875afab977005b03d307040fb3be15c7524a37ff)
| * | | | | | Remove TEST_QNETWORK_PROXY define from the testsMarkus Goetz2010-01-049-88/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always test the proxies now. Reviewed-by: Thiago
* | | | | | | doc: Fixed remaining qdoc errorsMartin Smith2010-01-041-44/+73
|/ / / / / / | | | | | | | | | | | | | | | | | | Added a missing \class command, some missing enum values, etc.
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-041-0/+1
|\ \ \ \ \ \
generated by cgit v0.12 at 2025-01-23 09:29:33 (GMT)