summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \
| * | Mac: qcolordialog autotest fails.Richard Moe Gustavsen2010-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | I removed a line as an optimization a while ago. Luckily, the autotest cought a failure doing so. So we put the line back in. Reviewed-by: Prasanth
* | | doc: Removed a const from a declaration in the example.Martin Smith2010-01-041-1/+1
|/ / | | | | | | Task-number: QTBUG-7092
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-04158-1363/+7895
|\ \
| * | Remove the need to know the service owner when adding/removing signal rules.Thiago Macieira2010-01-024-34/+21
| | | | | | | | | | | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe
| * | Use the watched service name list in matching incoming signals too.Thiago Macieira2010-01-021-2/+8
| | | | | | | | | | | | | | | Task-number: QTBUG-5979 Reviewed-By: TrustMe
| * | Change the QtDBus watched service list to a map to its owner.Thiago Macieira2010-01-022-17/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of simply counting how many times we're watching a service, also map a service to its owner. This allows us to provide a faster, cached GetNameOwner too. Technically, this could mean that a service that is started in-between event loops could remain invalid for a longer period of time. I'm not sure this is an issue -- will need some testing in KDE. Task-number: QTBUG-5979 Reviewed-By: TrustMe
| * | Update debug output to show the connection's ptr and threadThiago Macieira2010-01-021-10/+10
| | |
| * | Update the scrolling code of FlickCharmBenjamin Poulain2009-12-301-110/+177
| | | | | | | | | | | | | | | | | | Change the behavior of the scrolling so it is more usable on small devices. Add a code path for accelerating the autoscrolling if paning over a auto-scrolling frame.
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-306-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-30 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. Upstream Symbian def files from Qt 4.6. These files define the ABI of QtWebKit on Symbian. * symbian/bwins/QtWebKitu.def: Added. * symbian/eabi/QtWebKitu.def: Added.
| * | Symbian build fixSimon Hausmann2009-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Disable bearer management support in WebKit for builds inside Qt. We can't depend on an external module that depends on what we're building right now :) This is just a stop-gap fix. Reviewed-by: Trust me
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-304-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | ( c07df5686b431aa5d11643d00308d8f8f59d88b1 ) Changes in WebKit/qt since the last update: * Disable HTML5 Datagrid * Fix RVCT build
| * | For maemo, do not strip the binaries during the installation.Adrian Constantin2009-12-301-0/+1
| | | | | | | | | | | | | | | | | | The binaries will be stripped during packaging. Reviewed-by: Tom Cooksey
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-3012-15/+255
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-2912-15/+255
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-2912-15/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-14 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix JavaScript prompt behavior for empty/null strings. https://bugs.webkit.org/show_bug.cgi?id=30914 The patch is based on the work done by Gupta Manish. In the default implementation of the JavaScript prompt we are using a QInputDialog to get the text and this has one quirk with regard to not entering any text. In other WebKit ports and in Firefox an empty string is returned but in the Qt case it is a null string. Change the API documentation in QWebPage to mention we want to have a non null string but do the fixup in the ChromeClientQt to support existing code. * Api/qwebpage.cpp: (QWebPage::javaScriptPrompt): Change API documentation * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-294-11/+38
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Remove pointless const's from functions (internal API) Fixes crash when widget with WA_StaticContents child become toplevel.
| | * | | Remove pointless const's from functions (internal API)Tom Cooksey2009-12-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is in response to the review for b063135, but was missed from that patch. Reviewed-By: Kim
| | * | | Fixes crash when widget with WA_StaticContents child become toplevel.Olivier Goffart2009-12-292-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Happens for example if a DockWidget is undocked and has a child whith the WA_StaticContents attribute. The parent does not change (so newParent is false) but still, the top level widget change. So staticWidget need to be moved to the new backingstore. Reviewed-by: Benjamin Poulain Task-number: QTBUG-6883
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-293-4/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed QtWebkit.dll from Qt.sis in Symbian builds
| | * | | | Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-293-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for future removal of Webkit from Qt, Qt.sis no longer contains QtWebkit.dll. All projects that have webkit dependency now automatically also add dependency qtwebkit.sis into their .pkg files. To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore directory. Task-number: QTBUG-6841 Reviewed-by: Simon Hausmann Reviewed-by: Janne Koskinen
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-291-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed a copy-paste error in QRasterPixmapData::metric().
| | * | | | Fixed a copy-paste error in QRasterPixmapData::metric().Trond Kjernåsen2009-12-291-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling metric() to get the device height in mm of a pixmap when using the raster engine would actually return the width.. Task-number: QTBUG-6985 Reviewed-by: Carlos Duclos
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-2819-227/+470
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QUrl::toEncoded() fix for the case of "password, but no username". Fix tst_QFileInfo::isHidden_data on Windows QStyleSheetStyle: Fixed some text croped when having padding with native border. Lots of mostly cosmetic cleanups to GL2 paint engine Move the 0.5 offset we add for aliased rendering to updateMatrix() revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845 Read QWS_SIZE from layer rather than screen Get rid of no_cast_from_ascii warning Docs: Amendments to latest changes to QImageReader docs. images: Document QImageReader::loopCount behaviour for infinite loops gif: Add unit test for QImageReader::size calls gif: 10% speedup on microbenchmark on QImageReader png: Avoid calling QImage::scanLine(int) from within a loop QImageReader: Avoid errorString creation in the normal case Fix text rendering on GL2 paint engine
| | * | | QUrl::toEncoded() fix for the case of "password, but no username".David Faure2009-12-282-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUrl::setPassword() without QUrl::setUserName() is actually useful, e.g. for kde's ldap:// slave. QUrl::toString() already handled this correctly, but QUrl::toEncoded() would forget the password in such a case. Autotest added. Merge-request: 2276 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
generated by cgit v0.12 at 2025-09-13 20:20:41 (GMT)