summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* fix another broken mergeHarald Fernengel2009-08-061-5/+5
|
* fixed borked up mergeHarald Fernengel2009-08-061-0/+3
|
* Merge commit 'qt/master-stable'Jason Barron2009-08-06113-922/+11010
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * Merge AudioServices into mainline.Justin McPherson2009-08-0545-0/+10166
| |
| * Merge branch '4.5'Bill King2009-08-055-12/+36
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * Make file extension case insensitive with the Gtk+ file dialogJens Bache-Wiig2009-08-041-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt dialog treats extension filters as case insensitive where the default behavior of the Gtk+ file dialog is to be case sensitive. The GtkFileFilter allows only simple glob syntax to be used so we basically rewrite the extension string from .xyz to .[xX][yY][zZ]. Task-number: 259155 Reviewed-by: joao
| | * Fix: Gtk native dialogs do not repaint when zero-timers are usedJens Bache-Wiig2009-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that our glib timers were given too high priority, effectively starving the Gtk event loop. By assigning our timer source, G_PRIORITY_DEFAULT_IDLE we ensure that all gtk+ events are handled first, thus allowing the native dialogs to respond and repaint properly. Task-number: 258433 Reviewed-by: bhughes
| | * Fix indentation.Alexis Menard2009-08-041-1/+3
| | | | | | | | | | | | Reviewed-by:TrustMe
| | * Fix ancestor flags that are not correctly update when reparenting.Alexis Menard2009-08-041-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | updateAncestorFlags was not reseting the flags if you change the parent that have for instance itemsClipChildrenToShape to a new one that doesn't have that flag. Task-number:258956 Reviewed-by:bnilsen
| | * Build on snow leopard.Morten Sorvig2009-08-041-1/+1
| | | | | | | | | | | | | | | | | | Don't error out when building qmake, just let it build a 64-bit binary (even for carbon) RebBy: Richard Moe Gustavsen
| | * Preserved fill rule for perspective mapped strokes in raster engine.Samuel Rødal2009-08-032-0/+3
| | | | | | | | | | | | | | | Task-number: 254407 Reviewed-by: Gunnar
| * | Fixes casing issue in the PSQL driver.Bill King2009-08-051-5/+5
| | | | | | | | | | | | | | | The record and primaryIndex functions don't take into account that psql treats different casing as different entities when enquoted.
| * | Fix compilation after my last change to qobject_p.hThiago Macieira2009-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | I renamed deletionNotification back to its original name. I had forgotten that QWidget needed a similar change. Reviewed-by: Trust Me
| * | Fixed bug where Q[Styled]ItemDelegate edition wouldn't terminate whenGabriel de Dietrich2009-08-042-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | the item lost focus to an unrelated dialog. The tests against the active modal window was unnecessary. Task-number: 257859 Reviewed-by: olivier
| * | Restore the old name for QObjectDeletionNotification.Thiago Macieira2009-08-042-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're going to do changes to simplify some of the Declarative UI enablers, let's do them all at once. That way, the adaptation necessary happens only once, as opposed to every time we do the changes. I tried not to break by leaving a typedef, but obviously the QObjectPrivate member isn't affected by the typedef... Reviewed-by: Trust Me
| * | Revert "Remove currentChildBeingDeleted from QObjectPrivate."Thiago Macieira2009-08-042-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 128717b171f01c82e5f0fb83f5923d4f7b9cfc10. The change broke Alien because QWidget no longer has the native window handle in its own private. It needs to access the top-level window (or the one with the native handle) in order to perform some operations. The problem is that it needs to do that in the destructor. And we cleared the parent before the destructor was run. Technically speaking, reverting is the correct thing to do, since the parent *still* exists when the child is deleted.
| * | qregext filter changed to support additional parameter/unicodeMatthew Cattell2009-08-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed the QRegExp filter back to the old form plus an additional piece to allow international characters. the new regular expression now allows a file type filter to contain a bracketed description prior to the filter set itself. 259105 Andy Shaw
| * | Add QWeakPointer::data, which thread-unsafely returns the tracked pointerThiago Macieira2009-08-042-2/+75
| | | | | | | | | | | | | | | | | | | | | | | | This function allows one to retrieve the pointer out of a QWeakPointer without promoting it to QSharedPointer first. That means there are no guarantees that the object won't get deleted. Reviewed-by: Bradley T. Hughes
| * | Reorganise QObjectPrivate so that it's easier to tell what's in it.Thiago Macieira2009-08-043-70/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename QDeclarativeData to QObjectDeletionNotification, since it has no relation to declarative UI. It's just notification of the object's deletion. Make the destructor non-inline and place it in qobject.cpp, so that the virtual table is emitted there and exported from QtCore. Also move the QObjectData destructor to qobject.cpp. This means you cannot create any class deriving directly from QObjectData outside QtCore, which is the intention anyways (it's a private class and only QObjectPrivate derives from it). Reviewed-by: Bradley T. Hughes
| * | Clean up old Jambi code: there's a way of getting the QObject d-pointerThiago Macieira2009-08-041-8/+1
| | |
| * | Don't try to make direct system calls on Linux.Thiago Macieira2009-08-043-99/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Accept that we cannot do everything, so users using outdated toolchains may have threading problems (leaking file descriptors). It's not like this is a recent problem anyway... Reviewed-By: Bradley T. Hughes
| * | Removed the startPos/lastPos/pos from the gesture classes.Denis Dzyubenko2009-08-046-118/+6
| | | | | | | | | | | | | | | | | | | | | | | | It doesn't make much sense to have that low-level info neither in the base QGesture class, nor in the QPanGesture, as the latter one has offset properties instead. Reviewed-by: trustme
| * | Removed the QTapAndHoldGestureDenis Dzyubenko2009-08-043-115/+16
| | | | | | | | | | | | | | | | | | | | | | | | Moved the gesture implementation to the imageviewer example as it cannot be fully implemented in a crossplatform way - for example on Windows tap and hold is a system gesture that is transparent to the application. Reviewed-by: trustme
| * | Moved the native window gesture handling code to the right place.Denis Dzyubenko2009-08-046-77/+121
| | |
| * | Renamed internal WinGesture event to NativeGesture.Denis Dzyubenko2009-08-047-19/+27
| | | | | | | | | | | | | | | | | | | | | It will also be used on Mac, so it doesn't make sense to keep it windows specific. Reviewed-by: trustme
| * | QNAM HTTP Code: Moved append() functions to the reply objectMarkus Goetz2009-08-044-36/+37
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | QHttpNetworkConnection: Moved channel slots to channel objectMarkus Goetz2009-08-045-267/+249
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | Fix build on HarmattanTom Cooksey2009-08-041-4/+7
| | |
| * | Added input hints to QGraphicsItem.jasplin2009-08-044-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows for input hints to be set on a QGraphicsItem. Input methods use such hints to define its appearance/behavior (e.g. to allow for numerical input only). Reviewed-by: ahanssen Task-number: 254493
| * | QParallelAnimationGroup pause resume fixedThierry Bastian2009-08-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | If you resumed a parallel animation group, it would always restart (ie. stop and start) the animation which would reset its current time to 0 and trigger flickering. autotest included. Task-Number: 259102
| * | Animations: better handling of the timerThierry Bastian2009-08-042-27/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could be that if you start lots of animations, they would not be started at the same time and even have their first tick to late. So we needed to only transfer the started animation when receiving the start/stop timer tick. In addition, if the animation timer is already active we don't restart it. This would cause no animation to receive ticks if lots of them are started.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-08-0436-248/+282
| |\ \
| | * | fix warning on MSVCThierry Bastian2009-08-041-2/+1
| | | |
| | * | QMenu now takes minimum width into account for the action rectsThierry Bastian2009-08-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The action now try to take advantage of the space given by a minimum width. Patch proposed initially by Aron Seigo and improved later on. Reviewed-by: Trustme
| | * | Fixes selectionModel::hasSelection return value after model::resetLeonardo Sobral Cunha2009-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After resetting the model, the selectionModel::hasSelection() of the view should return false. Fixed the corresponding autotest, which was wrong. Task-number: 256502 Reviewed-by: thierry
| | * | fix warnings on mingw (gcc4.4)Thierry Bastian2009-08-046-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | basically reordering members initialization in constructors or fixing singed/unsigned checks. Reviewed-by: Trustme
| | * | Mac: Remove debug work outputRichard Moe Gustavsen2009-08-041-1/+0
| | | |
| | * | Add support for pan gesture on mac (carbon and cocoa)Richard Moe Gustavsen2009-08-042-0/+70
| | | |
| | * | Remove the "preliminary support" warning for 10.6Morten Sorvig2009-08-041-4/+1
| | | | | | | | | | | | | | | | | | | | Also make the "usupported on > 10.6" error a warning. No need to stop the build, the warning will be printed enough times.
| | * | Build on snow leopard.Morten Sorvig2009-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Don't error out when building qmake, just let it build a 64-bit binary (even for carbon) RebBy: Richard Moe Gustavsen
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-08-041-26/+21
| | |\ \
| | | * | Fixes failed queries when mysql auto-preparesBill King2009-08-041-26/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Queries like "Show Index" etc, fail on mysql when automatically prepared due to a bug in several versions of mysql. Basically anything but a select query will fail. This fixes this by making the user explicitly prepare the query if they want to, and the blame then falls on them if they try and prepare a statement likely to fail. This fix also seems to result in a speedup for single-execution queries, possibly due to reduction in roundtrip communications. All autotests pass & behaviour conforms to documentation. Task-number: 252450, 246125
| | * | | Fix incorrect license headers.Jason McDonald2009-08-047-31/+41
| | |/ / | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fix obsolete license headersJason McDonald2009-08-046-10/+10
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc fixesAaron Kennedy2009-08-042-0/+8
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | have QPainter::begin() return false on null paint engineGunnar Sletta2009-08-041-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
* | | | Merge commit 'origin/master'Jason Barron2009-08-065-72/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qfilesystemmodel/qfilesystemmodel.pro tests/auto/qfontdialog/tst_qfontdialog.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp tests/auto/qsqldriver/qsqldriver.pro tests/auto/qsqlquery/qsqlquery.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qstatemachine/tst_qstatemachine.cpp tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * \ \ \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-053-31/+37
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-0559-551/+506
| | |\ \ \ \
| | * | | | | memory leak fix in standardItemModel found during combo box testingmread2009-08-052-13/+11
| | | | | | |