summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-04100-800/+1642
|\
| * 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
| * Apparently fixes some build issues on some old unixes...Pierre Rossi2009-12-041-1/+1
| | | | | | | | Reviewed-by: Marius Storm-Olsen
| * 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
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andy Shaw2009-12-031-0/+8
| |\
| | * 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
| * | 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-0392-775/+1563
| |\ | | | | | | | | | | | | | | | 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
| | * Fix typo in configure.Thiago Macieira2009-12-031-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Revert "Fixed qmake to run extra compilers in the build dir."Bradley T. Hughes2009-12-031-4/+0
| | | | | | | | | | | | This reverts commit 7f1d1d94160e9ef4da85eb2780ab17af1a482848.
| | * Fixed qmake to run extra compilers in the build dir.J-P Nurmi2009-12-021-0/+4
| | | | | | | | | | | | | | | Merge-request: 1881 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * Add config checks to auto.proJouni Hiltunen2009-12-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests\auto\auto.pro does not check for qt3support or opengl. On symbian this generates errors as the build file generation for the tests is skipped but the tests are still added into bld.inf for the autotests. X:\QT\tests\auto\BLD.INF:250: qgl\bld.inf: No such file or directory Added check for qt3support before adding Q3SUBDIRS and opengl check before adding qgl. External-Reviewed-by: samuelnevala Merge-request: 2104 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * Merge branch '4.5' into 4.6-stagingThiago Macieira2009-12-022-4/+25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/known-issues.qdoc src/script/qscriptextqobject.cpp tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
| | | * 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-302-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * fix baseline for "backslashes"Oswald Buddenhagen2009-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | this is a windows-only test, so it never failed for the "usual suspects" ...
| | | * Update known issues.Jason McDonald2009-11-141-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Refer to new bug tracker and remove known issue for VS Integration (as it has been replaced by the VS Add-in). Reviewed-by: Trust Me
| | * | 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
| | * | Benchmark: Duplicate the tests on QDirIterator as well.Thiago Macieira2009-12-021-1/+36
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | 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
| | * | Fixes a couple of minor doc pointsAndy Shaw2009-12-022-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the perl requirement for building from source on Windows and clarified that the support for OpenGL ES Common Lite 1.0 is being dropped and not for OpenGL ES Common Lite as a whole. Reviewed-by: Martin Smith
| | * | Update QtCore DEF file to remove isSignalConnected() (which is now inline)Iain2009-12-021-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Jason Barron
| | * | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-0271-455/+1107
| | |\ \
| | | * \ Merge commit 'oslo-staging-2/4.6' into upstream/4.6Olivier Goffart2009-12-0255-434/+927
| | | |\ \
| | | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-023-4/+10
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | * | qreal-izationAleksandar Sasha Babic2009-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defining QT_USE_MATH_H_FLOATS will enable single precision math functions that are called via Qt wrappers (qSin, qCos ...). Reviewed-by: axis
| | | | | * | Clarify the docs a bit when setting focus.axis2009-12-011-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | | | * | Minor doc update for known-issues wiki link.Janne Anttila2009-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6211 Reviewed-by: TrustMe
| | | | * | | Reduce double-copying of textures when flipping upside downRhys Weatherley2009-12-021-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bindTexture() flipped images in-place, to reduce data copying. But there is one case where the in-place is worse: when the QImage is not detached. In that case, the flip was copying the entire image and then flipping the lines, effectively processing the contents twice. The new version uses mirrored() to reduce the overhead for non-detached images. Reviewed-by: Samuel
| | | | * | | Fix crash in QVector::reserve when reserving smaller size on a shared vectorOlivier Goffart2009-12-012-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot call realloc with aalloc smaller than asize. Also include obvious optimisation: take the qMin computation out of the loop. Task-number: QTBUG-6416 Reviewed-by: Thiago
| | | | * | | QWindowStyle: make sure there is no duplicate in the list of scrollbar.Olivier Goffart2009-12-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the list grow and waste memory and CPU each time the stylesheet is changed or the widget is shown Reviewed-by: Thierry Task-number: QTBUG-6409
| | | | * | | 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
| | | | * | | QVariant documentation: there is no function QVariant::isEmpty()Olivier Goffart2009-12-011-1/+0
| | | | | | |
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-12-0116-289/+546
| | | | |\ \ \
| | | | | * | | Extended tst_QListView::indexAt to test viewport bounds.Gabriel de Dietrich2009-12-011-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | | | | * | | Fix QFontCombobox autotest on X11Olivier Goffart2009-12-012-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On X11, Font might have a foundry within bracket. This foundry is set by the font combobox, and makes the font comparison fail. Make sure the other attributes (size, bold, ...) are preserved when the font is changed. Reviewed-by: Gabriel
| | | | | * | | In QListViews, items were being hovered even when mouse was on the scrollbarsGabriel de Dietrich2009-12-011-2/+6
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Task-number: QTBUG-6284
| | | | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-12-0112-281/+525
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2
| | | | | | * \ Merge branch 'mmfphonon' into 4.6Gareth Stockwell2009-11-3012-281/+525
| | | | | | |\ \
| | | | | | | * | Clip video rect to physical screen dimensionsGareth Stockwell2009-11-261-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CVideoPlayerUtility API requires both a native window handle and an absolute screen rectangle in order to define the location of the rendered video output. On certain devices, such as the Nokia E75, which runs S60 3.2, if the absolute rectangle extends outside the physical screen extent, no video is rendered. This change works around this defect in the platform by clipping the video rectangle to the physical screen extent. Task-number: QTBUG-5467 Reviewed-by: trustme
generated by cgit v0.12 at 2025-09-13 20:20:19 (GMT)