summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* implement panning using touch eventsBradley T. Hughes2009-03-262-6/+8
| | | | | since we don't get mouse events to send to QGraphicsView's ScrollHandDrag handlers, we need to do it ourselves
* remove QApplicationPrivate::sendTouchEventBradley T. Hughes2009-03-262-9/+3
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-03-2659-1157/+1379
|\ | | | | | | windows-7-multitouch
| * Merge branch '4.5'Rohan McGovern2009-03-2640-43/+121
| |\ | | | | | | | | | | | | Conflicts: tests/auto/selftests/tst_selftests.cpp
| | * Change testlib selftest targets to help autotest tools.Rohan McGovern2009-03-2633-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The testlib subtests are conceptually not standalone unit tests, rather they are helper programs for the real unit test, tst_selftests. So, as is done for other similar tests (e.g. qprocess), don't name them with `tst_'. This makes it easier for automated tools to figure out that they shouldn't directly run these tests. Reviewed-by: Shane Bradley
| | * Remove outdated script which can't have worked since we stopped usingRohan McGovern2009-03-251-34/+0
| | | | | | | | | | | | perforce.
| | * Not part of the repositoryAlessandro Portale2009-03-251-0/+0
| | |
| | * alphaMask needs to be const, because first bytesPerLine() is called and then ↵Alessandro Portale2009-03-251-1/+1
| | | | | | | | | | | | bits(). The non-const bits() may detach and realign the data, so that the previous result of bytesPerLine() ist invalid. On S60, we actually had a 'skew' effect because of that.
| | * QGtkStyle: Support styled QFrameJens Bache-Wiig2009-03-251-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes QGtkStyle style QFrame. In order to avoid negatively affecting the performance we cheat by using a border image without the center part filled. GtkScrolledWindow style is used as QFrame is generally mapped to item views. 249363 ogoffart
| | * Fix flipping.Anders Bakken2009-03-251-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fixes two bugs with regards to Flip(). We blit'ed the boundingRect of the updated region rather than each rect which is wasteful. More importantly we ignored the offset which would lead to painting errors. Reviewed-by: Tom Cooksey
| * | Small documentation enhancement for QSslSocketMarkus Goetz2009-03-251-2/+5
| | | | | | | | | | | | RevBy: TrustMe
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-2519-1112/+1253
| |\ \ | | |/
| | * Clean up locking/unlockingAnders Bakken2009-03-251-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | Store the QDirectFBPaintDevice we're painting and use this when unlocking/locking instead of working on QPaintEngine::device() which isn't necessarily the same. Reviewed-by: Tom Cooksey
| | * Minor code cleanupAnders Bakken2009-03-251-3/+4
| | | | | | | | | | | | | | | | | | Improve readability of code. Reviewed-by: Tom Cooksey
| | * Make QDirectFBPaintDevice() protected.Anders Bakken2009-03-251-5/+7
| | | | | | | | | | | | | | | | | | | | | This class should never be instantiated without being subclassed so a protected constructor is the clean thing to do. Reviewed-by: Tom Cooksey
| | * Get rid of the setImageColorTable stuff.Anders Bakken2009-03-252-45/+0
| | | | | | | | | | | | | | | | | | | | | It's never necessary. Any surface we ever intend to lock and write to should never have a color table. Reviewed-by: Tom Cooksey
| | * Optimize bytesPerLine.Anders Bakken2009-03-252-6/+12
| | | | | | | | | | | | | | | | | | No sense in locking every time we want the bpl. The bpl won't change Reviewed-by: Tom Cooksey
| | * Optimize fillRects.Anders Bakken2009-03-251-6/+9
| | | | | | | | | | | | | | | | | | | | | No need to go through the FillRectangles case which would allocate a bunch of T on the stack. Reviewed-by: Tom Cooksey
| | * Fix layout problem in QMainWindowThierry Bastian2009-03-251-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | QDockWidget's minimum title width was not computed correctly and was thus provoking some strange layout issues. We need to ask for the widget's sizeHint for the close and float buttons. Task-number: 241577 Reviewed-by: ogoffart
| | * Doc - removed a trailing whitespaceKavindra Devi Palaraja2009-03-251-1/+1
| | | | | | | | | | | | | | | Task-number: None Reviewed-by: TrustMe
| | * Doc - removed mention of an internal function. Also gave theKavindra Devi Palaraja2009-03-251-973/+918
| | | | | | | | | | | | | | | | | | | | | | | | QApplication class and the QSessionManager class a documentation overhaul. Task-number: 249220 Reviewed-by: TrustMe
| | * Fix assertion failure in QCompleter::setCompletionPrefix().jasplin2009-03-252-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setCompletionPrefix() on a QCompleter from a slot connected to the editingFinished() signal of the corresponding QLineEdit could in some cases alter the internal state of the completer in such a way that an assertion would fail. The fix prevents the asserting code from being called in this particular state. Reviewed-by: janarve Task-number: 246056
| | * Fixed the gap that was not appearing on a QMainWindowThierry Bastian2009-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The default size of a docka area invalid and thus the gap had an invalid size. Task-number: 248069 Reviewed-by: ogoffart
| | * Fix a possible crash in QMainWindow when dragging a dock widget.Thierry Bastian2009-03-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Even when not animated, we need to set the plugging widget when plugging. This avoids a hover to be triggered in the middle of the operation. Task-number: 248069 Reviewed-by: ogoffart
| | * Fix QComboBox test with vertical panelsOlivier Goffart2009-03-251-1/+1
| | | | | | | | | | | | Reviewed-by: Thierry
| | * Changelog for fix e34a24dThiago Macieira2009-03-251-0/+2
| | |
| | * Add the placeholder file for Qt 4.5.1's changelogThiago Macieira2009-03-251-0/+123
| | |
| | * Fix crash while styling the title bar of a QMdiArea with stylesheetOlivier Goffart2009-03-251-1/+2
| | | | | | | | | | | | | | | | | | This stylesheet used to crash: *::title { border 1px solid black } Reviewed-by: bnilsen
| | * Fix a small mistake in recalculating the timeout in case we getThiago Macieira2009-03-251-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interrupted twice by a signal. If we're interrupted only once, there's no problem. If we're interrupted twice, we subtract the elapsed time since the beginning from the remaining time, so this won't work. The correct thing is to recalculate from the original timeout value. This is extremely difficult to test, since it requires that the select(2) call be interrupted twice by signals. The only way to do this is by sending two signals to a program from another program (or threads, with pthread_kill(3)) with less than half of the time left, then send data to cause the loop to exit with success. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * Fix QSharedPointer crashing when it is used as a global static in an ↵Thiago Macieira2009-03-251-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application. If it's used as a static, then the order of destruction is ill-defined. The QSharedPointer object may be destroyed after our Q_GLOBAL_STATIC knownPointers has been deleted, thus causing a null-pointer dereference. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: 246843
| | * Fix scrollbar appearing on QComboBoxOlivier Goffart2009-03-252-6/+72
| | | | | | | | | | | | | | | | | | | | | aefadefae655972287b196e6c0f0563c4fb4666c was not good enough Task-number: 248094 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
| | * Improve documentation of QGraphicsLayoutItem::setGeometry()Jan-Arve Sæther2009-03-251-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | Removed a lie, and made it more clear that you must reimplement this function in order for a layout to arrange the item. Task-number: 245550 Reviewed-by: alexis
* | | add a test for touch event propagationBradley T. Hughes2009-03-251-0/+143
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-03-2538-186/+718
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | Add in some enums from Snow Leopard.Norwegian Rock Cat2009-03-251-0/+7
| | | | | | | | | | | | | | | | | | I'm not using these yet, but we will eventually be making use of these in the buttons. Since they are enums, they don't add any symbols and can be safely added now.
| * | Better look of toolbar items on Leopard.Norwegian Rock Cat2009-03-251-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toolbar text items have a embossing on Leopard, so we should do that. However, they have a different look when "pressed" depending on whether or not they have an icons. We are very close to this effect (depending on how transparency rounding goes). Steps have also been taken so that the Tiger look is preserved. This is step one in several of getting the toolbars to look better on Leopard and friends. Task-number: 248006 Reviewed-by: Jens Bache-Wiig
| * | introduce QT_NO_NETWORKDISKCACHEPeter Hartmann2009-03-255-23/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that was necessary because when defining QT_NO_TEMPORARYFILE there would be a compile error in qnetworkdisccache.h, which uses a QTemporaryFile. Moreover, the script "make_qfeatures_dot_h" was updated to generate LGPL license header. Reviewed-by: Paul Task-number: 248807
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-246-92/+21
| |\ \ | | |/
| | * Squashed commit of the following:David Boddie2009-03-246-92/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 57ce15b2984cb7ccc4ab0b5dc03812d525d52620 Author: David Boddie <dboddie@trolltech.com> Date: Tue Mar 24 16:55:41 2009 +0100 Removed internal, hidden documentation. Also fixed the language used, slightly. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> commit 0a81cc2a6dfc98087de92e53d493bed56826642f Merge: 4bd3eca... dd7b1f1... Author: David Boddie <dboddie@trolltech.com> Date: Tue Mar 24 15:24:32 2009 +0100 Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 commit 4bd3eca8855bb2564e146be4d0a3bba836d20122 Merge: dc789e3... 1d1c52c... Author: David Boddie <dboddie@trolltech.com> Date: Mon Mar 23 19:20:05 2009 +0100 Merge branch 'qt/4.5' of ../qt-45-documentation into 4.5 commit 1d1c52c60995058b61ee35e3970fecc1de3b85b6 Merge: 6c5de23... 381b6cc... Author: David Boddie <dboddie@trolltech.com> Date: Mon Mar 23 19:17:37 2009 +0100 Merge branch 'qt/4.5' of git://scm.dev.nokia.troll.no/qt/qt-45 into qt/4.5 commit 6c5de23611baef3c6be59b94ebd29d901056c2fc Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 18:26:11 2009 +0100 Fixes: Doc: Fixed typo. Reviewed-by: David Boddie <dboddie@trolltech.com> commit 5d710cc183699513b1582507dcb4cddefb91c8ad Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 18:24:31 2009 +0100 Fixes: Doc: Made it clearer what qDebug() actually does. Reviewed-by: David Boddie <dboddie@trolltech.com> commit 1fae0b3b34bf066e2356671a5c6187485b2b587d Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 17:53:09 2009 +0100 Fixes: Doc: Added a note about not modifying the text document in a paint event handler. Task-number: 246550 Reviewed-by: David Boddie <dboddie@trolltech.com> commit 29662d44de9b42d811e60a1b57d871335888373a Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 17:04:07 2009 +0100 Fixes: Doc: Fixed styling of code in this tutorial. Task-number: 247053 Reviewed-by: David Boddie <dboddie@trolltech.com> commit 630c11d6f9f20d5f99bc964efaf4b39daaeb32c4 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 19 15:19:24 2009 +0100 Fixes: Doc: Note the use of just the name of a method rather than a complete signature. Task-number: 247857 Reviewed-by: David Boddie <dboddie@trolltech.com>
| * | better help outputOswald Buddenhagen2009-03-242-16/+12
| | | | | | | | | | | | | | | | | | - lconvert: remove the duplicated format list now that source files are not listed as "formats" any more - wording improvements
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-2426-50/+572
| |\ \ | | |/
| | * Fixes a focusWidget when showing a toplevel that accepts keyboard input.Denis Dzyubenko2009-03-242-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a toplevel window is the widget that can accept keyboard input, it doesn't get focus when shown. The fix is to check if the toplevel is activated and noone has focus, then give focus to the toplevel itself. Reviewed-by: Brad Task-number: 244607
| | * Don't commit an empty string to the widget when it looses focus.Denis Dzyubenko2009-03-242-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a wiget that accepts keyboard input looses focus and the input context is resetted we should clear the old preedit string by sending an empty commit string only if the widget received non-empty pre-edit string before. Reviewed-by: Brad
| | * Fix some extra file system stats that we were doing in the model.Alexis Menard2009-03-244-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch basically ensure that we share the same QFileinfo all over the place for each nodes (then we benefit of the cache). It fix also an extra stat due of a bugfix that was not optimal. Task-number: 247645 Reviewed-by: jasplin
| | * Make sure the sorting is updated when dynamic sorting is enabled and the ↵Olivier Goffart2009-03-242-0/+57
| | | | | | | | | | | | | | | | | | | | | model is reset Task-number: 248868 (part 2) Reviewed-by: Thierry
| | * Make sure QSortFilterProxyModel::sort always sort when DynamicSort is not usedOlivier Goffart2009-03-242-1/+61
| | | | | | | | | | | | | | | Task-number: 248868 (part 1) Reviewed-by: Thierry
| | * Add documentation about how to create shared libraries.Friedemann Kleint2009-03-244-2/+252
| | | | | | | | | | | | | | | Reviewed-by: Paul Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
| | * Do not cache the sizeHint() while we're in QGraphicsWidget's constructor.Jan-Arve Sæther2009-03-244-29/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not send a QFontChange event before the item has been polished. This is because we cannot call a virtual function while we're in the ctor. This is basically the same as how we do it in QWidget. Task-number: 246215 Reviewed-by: alexis
| | * Handle monochrome CGColors as well.Norwegian Rock Cat2009-03-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | It seems that snow leopard is storing some colors as grayscale. This means that we need to handle them or otherwise things go very black. It's an easy case to do as well, so just do it. Reviewed-by: Bradley T. Hughes
| | * Compile in Snow LeopardTrenton Schulz2009-03-241-0/+4
| | | | | | | | | | | | | | | | | | GCC 4.2 needs to have this extern (and likely every compiler != gcc 4. Reviewed-by: Trust Me