summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-131-7/+14
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Fixes a crash when setting focus on a widget with a focus proxy.Denis Dzyubenko2010-01-061-6/+13
| | | | | | | | | | | | | | 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
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6'Thiago Macieira2010-01-081-4/+10
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * doc: Added note explaining grabMouse() for Cocoa and Carbon.Martin Smith2010-01-051-4/+10
| | | | | | | | Task-number: QTBUG-6810
* | Merge branch '4.6'Thiago Macieira2010-01-051-6/+5
|\ \ | |/ | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * Fixes crash when widget with WA_StaticContents child become toplevel.Olivier Goffart2009-12-291-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-091-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Export QGLShareRegister because qgl_share_reg() is exported Fix upside down PVR compressed textures. Make sure a context is current when loading compressed textures. Fix possible off-by-one inconsistency against system look and feel when Fixes broken graphics effect auto tests. Doc: Explicitly mention that QWidget/QGraphicsItem takes ownership of effects. Remove id property from QGraphicsObject Minor fixes to softkey dimming support (commit 245c9cc0). FEP returns the wrong foreground color in GetFormatOfFepInlineText
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-081-10/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix GL_BGRA formats under OpenGL/ES systems Compilation fix Assert in designer while drag & dropping items from a QListWidget Fixed memory leaks when removing a QGraphicsEffect from a QGraphicsItem or QWidget Fix the toolbars docking Added dimming support for disabled softkeys in Symbian. Remove compilation warning from S60pixelMetrics on ARM Button and LineEdit/TextEdit theme colors are incorrect QS60Style: Overwrites correct stylehint color values MMP_RULES overriding qmake variables now warns user Switched S60 QDesktopServices implementation to CDocumentHandler based. Fixed "...QString::QString(const char *)... is deprecated" warning. Unnecessary symbian version checks in sqldrivers.pro QS60Style: Always store changed theme palette
* | \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-151-10/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * \ \ \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-10/+6
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Doc: Explicitly mention that QWidget/QGraphicsItem takes ownership of effects.Bjørn Erik Nilsen2009-12-081-0/+2
| | |/
| | * Fixed memory leaks when removing a QGraphicsEffect from a QGraphicsItem or ↵Yoann Lopes2009-12-071-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWidget with setGraphicsEffect(0). The effect was not deleted in that case, problem solved for both QGraphicsItem and QWidget. Autotest included. Task-number: QTBUG-5917 Reviewed-by: bnilsen
* | | Merge commit 'oslo-staging-1/4.6' into master-mainlineRichard Moe Gustavsen2009-12-041-1/+3
|\ \ \ | |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-staging1Denis Dzyubenko2009-12-031-2/+8
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoawindow_mac.mm
| * | Do not emulate mouse event out of touch pad eventsDenis Dzyubenko2009-12-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the touch event comes from a touchpad it doesn't seem necessary to send fake mouse events. At least on the platform that actually supports touchpad events (i.e. Mac) native apps don't do that and the current implementation breaks popup handling - since touch events are only sent by default if two or more fingers touch the touchpad, we send fake MouseButtonPress when second finger is pressed and MouseButtonRelease when the second finger is released - i.e. at the same time when the system send scrollWheel events. This causes the active popup to close when using two-finger scroll gesture. Reviewed-by: Brad
* | | Merge branch '4.6'Thiago Macieira2009-12-021-17/+23
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * | Clarify the docs a bit when setting focus.axis2009-12-011-2/+8
| |/ | | | | | | RevBy: Trust me
| * Fixes for tab/space usage in qwidget.cpp.Janne Anttila2009-11-251-15/+15
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.6'Thiago Macieira2009-11-251-15/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * avoid possible crash when showing a modal dialog from a widget destructorThierry Bastian2009-11-201-2/+3
| | | | | | | | | | Task-number: QTBUG-5804 Reviewed-by: denis
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-181-2/+4
| |\ | | | | | | | | | | | | Conflicts: configure.exe
| | * doc: Clarified function of setLayoutDirection()Martin Smith2009-11-171-2/+4
| | | | | | | | | | | | Task-number: QTBUG-5432
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-171-9/+12
| |\ \ | | |/
| | * Fix input method support on widgets that have a focus proxy set.Simon Hausmann2009-11-131-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | When enabling/disabling a widget or changing its InputMethodEnabled attribute, use the focus proxy widget's input context for reset and for setting the focus widget on the input context. Task-number: QTBUG-5781 Reviewed-by: Denis
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-131-0/+11
| |\ \ | | |/
| * | doc change: remove duplicate entry in "see also" and stray focusWidget.Christian Kamm2009-11-111-2/+1
| | | | | | | | | | | | Reviewed-by: owolff
* | | Merge branch '4.6'Thiago Macieira2009-11-131-0/+11
|\ \ \ | | |/ | |/|
| * | Code in gui/* should be completely namespacedhjk2009-11-111-4/+5
| | | | | | | | | | | | And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
| * | Improvements to graphics effects API after review round.Samuel Rødal2009-11-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Get rid of QGraphicsEffectSource from the public API, instead add convenience functions in QGraphicsEffect. This way we commit to less API, and are free to introduce a customizable QGraphicsEffectSource in a future release. * Move PixmapPadMode into QGraphicsEffect and tweak the names of the enum values. * Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility. Reviewed-by: Bjørn Erik Nilsen
| * | Doc: Added an example to demonstrate the QWebElement class.David Boddie2009-11-091-0/+11
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Fixed QPixmap::grabWidget() on widgets that have not yet been shown.Kim Motoyoshi Kalland2009-11-121-84/+92
| |/ |/| | | | | | | | | | | | | | | Fixed bug where QPixmap::grabWidget() would return a pixmap of a different size that the widget if the widget had not yet been shown or resized. Updated the qpixmap autotest. Task-number: QTBUG-4149 Reviewed-by: Trond
* | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-101-4/+5
|\ \ | | | | | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| * | Code in gui/* should be completely namespacedhjk2009-11-091-4/+5
| | | | | | | | | | | | And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
* | | Improvements to graphics effects API after review round.Samuel Rødal2009-11-101-5/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | * Get rid of QGraphicsEffectSource from the public API, instead add convenience functions in QGraphicsEffect. This way we commit to less API, and are free to introduce a customizable QGraphicsEffectSource in a future release. * Move PixmapPadMode into QGraphicsEffect and tweak the names of the enum values. * Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility. Reviewed-by: Bjørn Erik Nilsen
* | Doc: typo fixedJoerg Bornemann2009-11-091-1/+1
|/ | | | Reviewed-by: TrustMe
* Fixed uninitialized background artifacts in QWidget::render.Samuel Rødal2009-11-061-2/+1
| | | | | | | | | We need to use isOpaque to check whether the widget has an opaque background, it's not enough to just check the palette (it doesn't check Qt::NoSystemBackground for example). Task-number: QTBUG-5012 Reviewed-by: Gunnar Sletta
* Add QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-041-1/+18
| | | | | | | It depends on QT_NO_GRAPHICSVIEW for now, but it is possible to remove this dependency. Reviewed-by: paul
* Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-6/+7
|\ | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| * Gesture api review.Denis Dzyubenko2009-11-031-4/+4
| | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| * Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-031-0/+1
| | | | | | | | Reviewed-by: trustme
| * Added QGraphicsObject::ungrabGesture()Denis Dzyubenko2009-11-031-2/+2
| | | | | | | | | | | | | | Oops, apparently we forgot to add a function for unsubscribing a graphics object from a gesture. Fixing it now. Reviewed-by: trustme
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-301-0/+16
| |\
* | \ Merge commit 'origin/4.6' into featureJørgen Lind2009-11-021-15/+41
|\ \ \
| * \ \ Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-0/+16
| |\ \ \ | | | |/ | | |/|
| | * | Add QWidget::ungrabGestureThomas Zander2009-10-261-0/+16
| | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| * | | Merge commit 'widget/4.6' into origin/4.6Olivier Goffart2009-10-301-13/+9
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: src/gui/effects/qgraphicseffect.cpp
| | * | Wrong caching of opaque children in QWidget.Bjørn Erik Nilsen2009-10-281-13/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The opaque children cache was clipped to all the ancestors up to the top-level, which means whenever a widget changes geometry all the children must be invalidated. However, the bug was that we didn't invalidate the children, and that is of course slow so we don't want to do it either. A better solution is to only clip the children cache to the widget itself (widget->rect() instead of widget->clipRect()), and we can perfectly do this because the region we subtract the opaque children from is already inside the clipRect(). Auto-test included. Task-number: QTBUG-4245 (related to)
| * | Options on how to get a pixmap from an effect sourceGunnar Sletta2009-10-271-2/+16
| |/ | | | | | | | | | | Usable for future optimizations. Reviewed-by: Samuel
* | Fix GRAPHICSVIEWJørgen Lind2009-10-291-11/+29
| | | | | | | | Reviewed-by: tom
generated by cgit v0.12 at 2025-01-22 00:55:17 (GMT)