summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* GLES 2 should *not* use a multisampled format by default.Trond Kjernåsen2009-12-092-5/+1
| | | | | | | | This is a platform regression and should never have been there in the first place. Having this as the default format on embedded devices may drop the framerates with as much as 30% on selected HW. Reviewed-by: Tom Cooksey
* Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-099-1/+22
| | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
* Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-12-0925-332/+455
|\ | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-0940-546/+1385
| |\
| * | Fixed (unstable) tst_QTimeLine::currentTime test failureRohan McGovern2009-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use qFuzzyCompare instead of an exact floating point comparison when checking if valueChanged should be emitted. Task-number: QTBUG-6189 Reviewed-by: Dmytro Poplavskiy
| * | Fix cleanup hooks error.Sarah Smith2009-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | | Trying to fix QTBUG-6563, getting crash from cut-n-paste slippage, now fixed. Task-number: QTBUG-6563 Reviewed-by: Rhys Weatherley
| * | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-071-2/+10
| |\ \
| | * | Fix cursor positiong after block undo and redomae2009-12-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block changes in different selections happens quite frequently with Qt Creator, e.g. when renaming local variables. The desired behaviour which the tst_QTextCursor::cursorPositionWIthBLockUndoAndRedo() tests, is like this: after an undo, the cursor should be where it was when the block operation started. After a redo, the cursor should be where it was after the block operation ended. Reviewed-by: Simon Hausmann
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-12-062-6/+2
| |\ \ \
| | * | | Replace glColor4ub() calls with glColor4f()Rhys Weatherley2009-12-062-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel Q45/Q43 Express Chipset has problems with glColor4ub() not updating GL_CURRENT_COLOR correctly. Replace all references with calls to glColor4f() instead as it is more likely to be implemented correctly on all chipsets. Task-number: QTBUG-6217 Reviewed-by: Sarah Smith
| | * | | Fix crash in QVector::reserve when reserving smaller size on a shared vectorOlivier Goffart2009-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backport part of the commit 480b395bd652a4ac6e3f2 Task-number: QTBUG-6416
| | * | | Fixed a potential crash in QDockWidgetThierry Bastian2009-12-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened when inserting the gap over a place holder item. Task-number: QTBUG-6107 Reviewed-by: Gabi
| | * | | make signal handlers understand QVariant againKent Hansen2009-11-301-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, issue a warning if a type is not known to the meta-type system. Backport of 508c9cd681244a5ad566c12733aa70f5bd522b57 Task-number: QTBUG-5060
| | * | | Fixed a crash in the GL engine when trying to draw invalid pixmaps.Trond Kjernåsen2009-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6226 Reviewed-by: Eskil
| * | | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-0522-334/+463
| |\ \ \ \ | | | | | | | | | | | | | | | | | | oslo-staging-1/4.6 into 4.6
| | * | | | Fix compilation with Sun CC 5.9: it was crashing with this code.Thiago Macieira2009-12-041-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Definitely a compiler bug. Reviewed-by: Kent Hansen
| | * | | | Fix Run-Time Check Failure with MSVC when downcasting.Thiago Macieira2009-12-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you cast from a 64-bit type to a 32-bit one, MSVC produces an RTCF, despite the explicit cast. The solution is to add & 0xFFFFFFFF. Task-number: QTBUG-4255 Reviewed-by: Marius Storm-Olsen
| | * | | | Fixes: Compile fixJens Bache-Wiig2009-12-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: Turns out d648f23094e61705ceea10b2af526872406d022a was not properly applied.
| | * | | | Ensure the button state is correct when creating a QWheelEvent on Mac.Andy Shaw2009-12-032-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac when we receive a scrollWheel event on Carbon or Cocoa then we need to use QApplication::mouseButtons() in order to ensure the QWheelEvent has the right button states set. This is because the buttons state information is not passed in the native event at all. Reviewed-by: MortenS
| | * | | | Fixes: Support gtk-enable-mnemonics on QGtkStyleJens Bache-Wiig2009-12-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-6484 RevBy: thorbjorn Details: We currently ignore this property. It now maps to SH_UnderlineShortcut.
| | * | | | Compile fix for mac after the merge.Denis Dzyubenko2009-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-staging1Denis Dzyubenko2009-12-0354-469/+826
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoawindow_mac.mm
| | | * | | | Updates to QtGui DEF files for WINSCW and EABIIain2009-12-032-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to private/internal symbols only Reviewed-by: TrustMe
| | | * | | | Update include path for Symbian^3Iain2009-12-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian^3, public and platform headers have been split. Since we're using a platform header, we need to include the new header file on Symbian versions where the new header structure is in use Reviewed-by: TrustMe
| | | * | | | Assign Symbian UID to QtOpenVg moduleIain2009-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | Update QtOpenVG DEF file for EABI, add for WINSCW, on Symbian OSIain2009-12-032-1/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | Cocoa: refactor common code into a shared fileRichard Moe Gustavsen2009-12-036-277/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCocoaWindow and QCocoaPanel has many methods that are implemented _exactly_ the same way. Those methods are just copied/pasted between the classes because of inheritance problems. This is error-prone as bugs tends to be fixed inside one of the classes, but easily forgotten in the other class. This patch refactors out this code into a new file that is simply #included from the two classes. We do this fix for a patch release to ease a couple of fixes that is about to be integrated. Reviewed-by: Prasanth Reviewed-by: Denis
| | | * | | | Don't look at the patch-level number when loading plugins.Thiago Macieira2009-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt claims that it maintains forwards and backwards binary compatibility within the same Qt minor series. So it should be safe to load a plugin built with Qt 4.6.2 on Qt 4.6.1. Reviewed-by: Bradley T. Hughes
| | | * | | | Improved compatibility with MDI area custom themes on XPJens Bache-Wiig2009-11-111-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With certain custom Windows themes the window mask will be incorrectly set so that the subwindows become unusable. Instead of passing the window rect to the mask region function, we now only pass only the title bar rect and add the remainder at the bottom. This should improve compatibility with certain custom themes such as the Vista Inspirat Pack. Task-id: QTBUG-6271 Reviewed-by: prasanth
| | | * | | | Update QtCore DEF file to remove isSignalConnected() (which is now inline)Iain2009-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason Barron
| | * | | | | Improved mouse wheel event delivery on Mac.Denis Dzyubenko2009-12-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup is open we should not deliver wheel events to widget outside of the popup - native Cocoa applications don't do that. Reviewed-by: Richard
| | * | | | | 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
| | * | | | | Do not enabled Pan gesture by default on Mac.Denis Dzyubenko2009-12-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled Pan gesture makes your widget receive mouse release events while doing system gestures like two-finger scroll. Reviewed-by: Richard
| | * | | | | Improved implicit mouse grabbing on Cocoa.Denis Dzyubenko2009-12-024-42/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves 106121a74bca32a6411b9ca968ee415f8bdfbff1 which was incomplete and didn't work properly for comboboxes (or in general - when a popup window opens due to a mouse press). Reviewed-by: Prasanth
* | | | | | | Use 64bit for the connectedSignalsOlivier Goffart2009-12-092-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as QML objects may have lots of signals Do not use quint64 as it would produce lots of useless padding on MSVC 32bit Reviewed-by: Brad
* | | | | | | Fix regression in qVariantFromValue when converting from complex type to ↵Olivier Goffart2009-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple type QVariant v = QColor(Qt::red); v.setValue(1000); Would produce a variant with garbage. the destructor of QColor would not be called, and the 1000 would be in the QVariant::PrivateShared, while most of the QVariant code assume that numbers are dirrectly in the QVariant::Data union Task-number: QTBUG-6602 Reviewed-by: Thierry
* | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵axis2009-12-096-97/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| * | | | | | | Clean up debug message with DirectFBAnders Bakken2009-12-091-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some superfluous spaces. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | | | | | Enable customizing of DirectFB layer to useAnders Bakken2009-12-091-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables you to use a different layer for Qt apps by specifying: E.g. QWS_DISPLAY=directfb:layerid=2 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | | | | | | Set stacking class for stays-on-top windows in DFBAnders Bakken2009-12-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For better compatibility with non-QWS DirectFB apps running in the same session we should set the stacking class of Windows that have the StaysOnTop flag set. This corresponds nicely to DWSC_UPPER. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-0996-754/+2043
| |\ \ \ \ \ \ \
| | * | | | | | | Export QGLShareRegister because qgl_share_reg() is exportedRhys Weatherley2009-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | | | | Fix upside down PVR compressed textures.Rhys Weatherley2009-12-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "vertical flip" flag in the PVR format is the inverse of the "inverted y" state that we use in Qt. Reviewed-by: trustme
| | * | | | | | | Make sure a context is current when loading compressed textures.Rhys Weatherley2009-12-081-0/+2
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | | | | | Speed up rotated/transformed text on OpenGL2 paint engineGunnar Sletta2009-12-081-61/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond Reviewed-by: Tom
* | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-087-500/+340
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | 4.6-staging2
| * | | | | | | Def file updatesShane Kearns2009-12-082-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | | Implement qsrand() for Symbian OSShane Kearns2009-12-081-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After checking the source code of OpenC stdlib, rand and srand are thread safe (they use Symbian's TLS internally) so the Symbian implementation mostly follows the Windows one (where this is also true) Task-number: QTBUG-6372 Reviewed-by: Janne Koskinen
| * | | | | | | Crash: when opening the File Dialog in Media Player (armv5)Sami Merilä2009-12-084-470/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to NGA API changes in Tb9.2. Because of API changes, S60Style needs to have a lot of internal changes. First, the changed style no longer itself tries to uncompress and handle CFbsBitmaps, but instead uses the QPixmap backend for it. Second, all references to CFbsBitmap::DataAddress() have been removed. Third, the lookup table for theme parts has been cleaned up. Task-number: QTBUG-4644 Reviewed-by: Janne Koskinen
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2009-12-087-9/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /
generated by cgit v0.12 at 2024-12-05 00:30:32 (GMT)