summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-0223-293/+925
|\ | | | | | | | | Conflicts: demos/mediaplayer/mediaplayer.pro
| * Changed implementation of qDrawBorderPixmap() to use qDrawPixmaps().Kim Motoyoshi Kalland2009-10-026-240/+262
| | | | | | | | Reviewed-by: Trond
| * Added support for drawing a pixmap multiple times in one call.Kim Motoyoshi Kalland2009-10-029-48/+292
| | | | | | | | | | | | | | | | | | This is internal API. It's possible to specify a horizontal and vertical scale, rotation, opacity and source rectangle for each pixmap item. Useful for particle effects. Reviewed-by: Trond
| * Added qFastSin() and qFastCos() functions.Kim Motoyoshi Kalland2009-10-023-2/+333
| | | | | | | | | | | | The new functions use a lookup table. Reviewed-by: Trond
| * Add prefix to statemachine-specific event typesKent Hansen2009-10-025-9/+9
| | | | | | | | | | | | "Signal" and "Wrapped" is too generic; prefix with StateMachine. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * Doc: mark API of Gesture framework as preliminary.Volker Hilsheimer2009-10-022-0/+4
| | | | | | | | New API will most likely not be in the Beta release.
| * Adds a bool to QAbstractAnimationPrivate to keep track of top-level animationsLeonardo Sobral Cunha2009-10-022-9/+16
| | | | | | | | | | | | | | | | Also refactored the timer verifications on (un)registerAnimation: we should never register an animation that has a registeredTimer, but we can unregister an animation several times. Reviewed-by: thierry
| * Mac: bugfix 45f095b8970dc3c1b6f6e97fa2323654ba848288Richard Moe Gustavsen2009-10-021-9/+16
| | | | | | | | | | | | Seems like I forgot to handle page scrolls. Also did a small optimization (see also 45f095b8970dc3c1b6f6e97fa2323654ba848288)
| * Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-021-0/+17
| | | | | | | | | | | | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
* | Merge branch '4.6' into mmfphononFrans Englich2009-10-0259-166/+315
|\ \ | |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-0270-387/+615
| |\
| | * Use multimedia timers on Windows for timers less than 16msBradley T. Hughes2009-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | According to http://msdn.microsoft.com/en-us/library/ms725496(VS.85).aspx, the system time resolution is 10-16ms, so we should use multimedia timers for anything less than 16ms (the worst case).
| | * doc: Fixed numerous qdoc errors.Martin Smith2009-10-025-10/+7
| | |
| | * Mac: update/small fix to 45f095b8970dc3c1b6f6e97fa2323654ba848288Richard Moe Gustavsen2009-10-022-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | It turns out that we need to let singleStep keep its value in qtextedit so that pushing the up/down buttons on the slider works as they should. Moreover, overriding the behaviour in abstract slider also makes QGraphicsView work out of the box. Also added in the test fix suggested by Olivier.
| | * Renamed the values in the Qt::TileRule enum.Trond Kjernåsen2009-10-025-42/+42
| | | | | | | | | | | | | | | | | | | | | Stretch, Repeat and Round are too generic. Renamed to StretchTile, RepeatTile and RoundTile. Reviewed-by: Gunnar
| | * Fix compiler warnings on VS2008Prasanth Ullattil2009-10-0232-67/+69
| | | | | | | | | | | | | | | | | | | | | Disabled C4396 for both webit and javascript core projects. Fixed some C4100 (unreferenced formal parameter) warnings in Qt code. Reviewed-by: Simon Hausmann
| | * make private qws/qvfb data directory non-default, default to non-user specificJeremy Katz2009-10-022-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This turns the changes in 072e748adbdab1d51b240b9983ce82b213b66f18 off by default. Define QT_PRIVATE_QWS to turn them on. This must be done for both qvfb (X11 build) and libQtGui (QWS build). Failure to do so will result in an inability for applications to communicate with the server. Task-number: QTBUG-1711 Reviewed-by: Paul
| | * Clear text selection in QLabel when it is losing focusmae2009-10-021-1/+12
| | | | | | | | | | | | | | | | | | | | | The change implements the same logic for QLabel which QLineEdit (and implicitely QSpinBox and QComboBox) already had. Reviewed-by: Simon Hausmann
| | * Dealing with socket that was signalized on exception fds setAleksandar Sasha Babic2009-10-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that if socket was signalized via exception fds set, we should signalize only write notifier in the case where both read and write notifiers exist. If in this case we send signal to read notification socket will prematurely be closed. x#Reviewed-by: Janne Antilla
| | * Workaround for Open C bugAleksandar Sasha Babic2009-10-021-1/+1
| | | | | | | | | | | | Workaorund for SO_REUSEPORT / SO_REUSEADDR regression bug.
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-023-5/+36
| | |\
| | | * Add QAbstractItemView::setDefaultDropAction(Qt::DropAction)David Faure2009-10-023-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed when a list or tree supports both moving and copying, but moving should be the default (e.g. tree of bookmarks, or any other item that doesn't really make sense being copied in general, but moved often). Merge-request: 1668 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Reviewed-by: Thierry
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-021251-5351/+19283
| | |\ \ | | | |/
| | * | Make 16-bit graphicssystem opengl workGunnar Sletta2009-10-023-2/+18
| | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | * | Added timings to the QGL_BIND_TEXTURE_DEBUG debug outputsGunnar Sletta2009-10-021-8/+20
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Explicitely check for alpha pixels before creating an alpha GL pixnmapGunnar Sletta2009-10-021-6/+15
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | * | Explicitly check for alpha pixels in X11 before making an alpha XPixmapGunnar Sletta2009-10-021-3/+30
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | Filedialog impossible to use with keypad navigationSami Merilä2009-10-022-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileDialog contains own internal derived classes for line edit and list view. Unfortunately, these classes do not handle keypad navigation correctly - they just accept the navigation key events, causing the navigation to halt. Added support for QFileDialogListView, QFileDialogTreeView and private filedialog class QFileDialogPrivate to handle and possibly ignore keypad navigaion key events. Additionally, added support to keypad navigation to ignore empty widgets. This allows keypad navigation not to go invisible when empty widgets are tried to be navigated into. Task-number: QT-643 Reviewed-by: Alessandro Portale
* | | | Remove TODO.txt, we've moved to Jira.Frans Englich2009-10-021-29/+0
| |_|/ |/| |
* | | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-021055-3656/+8309
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_s60.cpp
| * | | Add configure flags to force turning on or off JavaScriptCore JITJørgen Lind2009-10-022-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add configure test to see if arm toolchain can compile JavaScript JIT Task-number:QTBUG-4632 Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com>, Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * | | Update documentation for sorting / stacking order in Graphics View.Andreas Aardal Hanssen2009-10-023-164/+202
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all references to "elevation" and how items are sorted by their "z order". Now use "stacking order" and only refer to "z-value" when discussing sibling order. Move almost all sorting docs from the QGraphicsItem::setZValue() function to a general overview section in QGraphicsItem's class documentation. Reviewed-by: David Boddie
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-023-37/+28
| |\ \
| | * | Remove QHash overhead from QGLShareRegisterRhys Weatherley2009-10-022-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the list of shared contexts from QGLShareRegister into QGLContextGroup. There is then no need for the QHash. Reviewed-by: trustme
| | * | Fix support for 32-bit PowerVR screens with QGraphicsViewRhys Weatherley2009-10-021-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QGLWidget was used as a viewport for QGraphicsView, it was still treating the window surface as RGB16. Use the screen's actual pixel format. Also ensure that PvrEglWindowSurface::image() returns a non-null QImage if the drawable hasn't been created yet. Reviewed-by: trustme
| | * | Remove unnecessary reference to QGLContextGroup::extensionFuncs()Rhys Weatherley2009-10-021-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | * | Remove unnecessary function definition: qt_qgl_egl_display()Rhys Weatherley2009-10-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The qt_qgl_egl_display() function no longer exists. Reviewed-by: trustme
| * | | Fixed logic in clock() function of audio class's.Kurt Korbatits2009-10-026-4/+10
| |/ / | | | | | | | | | | | | | | | | | | - clock() should return valid value except in stop state, return 0. - Added clock() function testing to unit tests. Reviewed-by:Justin McPherson
| * | Add "opengl2" as an option for creating an OpenGL graphics systemRhys Weatherley2009-10-011-0/+10
| | | | | | | | | | | | Reviewed-by: trustme
| * | Make Software Input Panel requests work with QGraphicsWebView _and_ QWebView ↵Simon Hausmann2009-10-013-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by sharing the event code in handleSoftwareInputPanel(). Patch by Simon Hausmann <simon.hausmann@nokia.com> on 2009-10-01 Reviewed by Tor Arne Vestbø. * Api/qwebpage.cpp: (QWebPagePrivate::mouseReleaseEvent): (QWebPagePrivate::handleSoftwareInputPanel): * Api/qwebpage_p.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48977 268f45cc-cd09-0410-ab3c-d52691b4dbfc
| * | Fix BadDrawable errors when re-parenting a QGLWidget on X11/EGLTom Cooksey2009-10-011-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's actually not really reparenting, but calling setWindowFlags which triggered the errors. But setWindowFlags causes a re-parent. The context isn't really the right please to free the surface, but fixing that is a much more intrusive change. Reviewed-By: TrustMe
| * | Refactor retrieving the X11 visual for EGLEskil Abrahamsen Blomfeldt2009-10-011-74/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | We need this in qwindowsurface_gl.cpp. This patch was modified slightly by Tom, who stole it from another branch. :-) Reviewed-by: Gunnar
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-10-013-3/+30
| |\ \
| | * | Fixed Designer property editor selection bug.Gabriel de Dietrich2009-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the editor had been created inside the QtPropertyEditorView (inheriting QTreeWidget), the subsequent show sent a synthetic mouse move event down to the QLineEdit, and a new selection was made on the text because the mouse button was marked as pressed in the event. QApplicationPrivate::sendSyntheticEnterLeave() now sends a mouse move event without any button pressed. Auto-test included in tst_QWidget. Task-number: QTBUG-4055 Task-number: 253159 Task-number: QT-659 Task-number: 245398 Reviewed-by: bnilsen
| | * | Fixes clipboard handling on X11.Denis Dzyubenko2009-10-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes handling selection requests for invalid targets - when someone asks for a target that is not supported by the clipboard content we shouldn't do anything (unless it's MULTIPLE). Fixes copying data when using Synergy which tries to get all targets it knows about even if they are not listed in TARGETS. Task-number: QTBUG-4652 Reviewed-by: Bradley T. Hughes
| | * | QNAM HTTP Code: Always send an Accept-Language headerMarkus Goetz2009-10-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send a header that we accept every language. Works around a bug in some broken websites and is hopefully of no harm for us. Task-number: QT-952 Reviewed-by: Thiago
| | * | Fixes: Phonon-gst: Respect device MediaSource property.Dmytro Poplavskiy2009-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QT-1027 RevBy: Andrew den Exter Details: All gst disk sources support setting device name with "device" property, otherwise the default device is used.
| | * | Fixes: Phonon-gst: use correct URLs for different disk types.Dmytro Poplavskiy2009-10-011-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Andrew den Exter Details: Phonon gstreamer backend used cdda:// URL and corresponding gst source element regardless of disk type.
| * | | Rename QWebGraphicsItem to QGraphicsWebViewAlexis Menard2009-10-018-96/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by Alexis Menard <alexis.menard@nokia.com> on 2009-10-01 Reviewed by Tor Arne Vestbø. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48974 268f45cc-cd09-0410-ab3c-d52691b4dbfc
| * | | Fixed typo in the doc.Denis Dzyubenko2009-10-011-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme