summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'oslo-staging-1/4.6' into master-mainlineRichard Moe Gustavsen2009-12-0429-340/+529
|\
| * 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
| * | | 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
* | | | Fix QPlainTextEdit cursorUp/Down in combination with non-visible blocksmae2009-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlainTextEdit uses QTextCursor::movePosition to reposition the cursor after pageUp/Down. If this cursor happens to be in non-visual mode (the default), it might end up on an invisible block. This results in magically unfolding sections in Qt Creator.
* | | | Merge branch '4.6'Thiago Macieira2009-12-0317-60/+112
|\ \ \ \
| * | | | Fix for virtual keyboard poping up when it should not.Robert Griebl2009-12-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pressing and releasing the finger/stylus on an editable text widget should only trigger the input method if the release position is still within the widget's boundaries. Reviewed-by: axis
| * | | | Added a placeholderText(*) property to QLineEdit.Robert Griebl2009-12-033-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please note: Qt for Maemo5 will already use it in 4.6, while the other platforms will be enabled in 4.7 (otherwise be would break BIC there) This commit adds a so-called placeholder text for line edits. If the widget doesn't have focus and the text() is empty, this placeholder will be shown. (*) also known as hint, click-message or descriptive text Reviewed-by: jasplin
| * | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-03126-602/+1680
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-02105-573/+1492
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-12-0118-23/+182
| | |\ \ \ \
| | * | | | | remove unused line of codeDerick Hawcroft2009-12-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6387
| | * | | | | Fixed QSqlRelationalTableModel doesn't correctly work with relation in other ↵Bill King2009-11-302-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database schema PSQL doesn't like having schema scoping in "AS" aliasing of fields, so use everything after the last "." separator for generating the alias. Task-number: QTBUG-5373 Reviewed-by: Justin McPherson
| * | | | | | really fix mingw+msysOswald Buddenhagen2009-12-022-27/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i missed the fact that lib2/ was duplicating the magic (totally pointlessly). so now all the magic moved to lib2/, as lib/ is not used on symbian anyway.
| * | | | | | less bizarre code; fix minor mistakesOswald Buddenhagen2009-12-021-25/+25
| | | | | | |
| * | | | | | compile fix for Qt in namespacehjk2009-12-011-0/+4
| | | | | | |
| * | | | | | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure the running thread can respond to the cancel request before overwriting it. Reviewed-by: kh1
| * | | | | | fix for mingw+msysOswald Buddenhagen2009-11-301-5/+9
| | | | | | |
| * | | | | | Fix a documentation typo.Christian Kamm2009-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal
| * | | | | | QVector: fix const_iterator-=(int)hjk2009-11-301-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel
generated by cgit v0.12 at 2025-09-23 11:20:27 (GMT)