summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge of the maemo-gestures branch onto qt/4.5.0Denis Dzyubenko2009-05-1138-6/+3174
| | | | | This is a squashed merge of all of the changes in the maemo-gestures branch on-top of the qt/4.5.0 branch.
* Merge branch 'windows-7-multitouch'Bradley T. Hughes2009-05-110-0/+0
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-1117-65/+160
| |\ | | | | | | | | | windows-7-multitouch
* | \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-1117-65/+160
|\ \ \ | |/ / |/| / | |/
| * fix build on windowsMaurice Kalinowski2009-05-111-1/+1
| | | | | | | | | | | | - partly revert f0243e70e05a3368582fd0478d840096d6b60c3f as it broke the build due to widgets accessible plugins using QDockWidgetLayout Reviewed-by: Rhys Weatherley
| * removed more exports on private classes (QMouseEventEx and QKeyEventEx)Thierry Bastian2009-05-081-2/+2
| |
| * removing additional unused export to classes only used in QtGuiThierry Bastian2009-05-081-4/+4
| | | | | | | | Reviewed-by: ogoffart
| * Do not export inline private classes in qcssparser_p.hThierry Bastian2009-05-081-7/+7
| | | | | | | | Reviewed-by: ogoffart
| * QToolBarLayout and QDockWidgetLayout, which are private classes, areThierry Bastian2009-05-088-30/+42
| | | | | | | | | | | | | | | | | | | | no more exported designer was using QToolBarLayout members. We fixed that by using styles. Reviewed-by: Friedemann Kleint Reviewed-by: ogoffart
| * Stop a crash in QMenuBar on Designer after my changes.Norwegian Rock Cat2009-05-081-0/+2
| | | | | | | | | | | | In the past, we checked on the existence of the pointer, but now that this is controlled by the property, we need to also check the pointer in the action event.
| * Fixed unwanted merging of undo commands from different edit blocksmae2009-05-083-20/+47
| | | | | | | | | | | | | | | | | | With this patch, commands no longer merge across block bounderies. In order to have merging still work for the normal insertion and deletion case, the unnecessary beginEditBlock()/endEditBlock() calls where cleaned up. Reviewed-by: Simon Hausmann
| * Extend QTextDocument testmae2009-05-081-0/+18
| | | | | | | | This new test tests desired undo merging behaviour after insertions.
| * Fixed leak of plugin instancesJoão Abecasis2009-05-081-1/+18
| | | | | | | | | | | | | | | | | | | | It seems that plugins were never explicitly unloaded, resulting in leaks of the instance object. Added a static deleter to ensure deletion on exit. The QPointer (previously in place) ensures we don't do a double-free nor try to access an invalid pointer. Task-number: 253013 Reviewed-by: mariusSO
| * Fix leak of global dataJoão Abecasis2009-05-081-0/+9
| | | | | | | | | | | | | | Static variable was dynamically allocated but never freed. Task-number: 253013 Reviewed-by: Thiago
| * Improved scrolling performance with invisible blocksmae2009-05-081-2/+12
| | | | | | | | Reviewed-by: Thorbjørn
* | by default, ignore touch events if the widget is disabledBradley T. Hughes2009-05-081-0/+3
| |
* | build the multitouch examples from the top-level buildBradley T. Hughes2009-05-081-1/+2
| | | | | | | | just needed to add multitouch to SUBDIRS in examples/examples.pro
* | set qt_tabletChokeMouse to true whenever ANY touch event was acceptedBradley T. Hughes2009-05-081-3/+2
| | | | | | | | this makes sure we always get touch events, and the don't drop out seemingly randomly.
* | don't require TouchUpdate events for the single touch casesBradley T. Hughes2009-05-081-26/+26
| | | | | | | | | | | | the finger may not move, meaning no update with move event is generated, even if we say "press, hold, release" when testing (the finger may not wobble enough)
* | warn about events that happen out of sequenceBradley T. Hughes2009-05-081-0/+7
| |
* | don't store event state in QWidgetPrivateBradley T. Hughes2009-05-082-17/+20
| | | | | | | | | | the only thing we store in the QWidgetPrivate is the current touch point list, nothing more (the rest is local state in the event translation code)
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-08141-1706/+4350
|\ \ | |/ | | | | windows-7-multitouch
| * Change optimization flags from Os to O2 for OS X applications.Morten Sørvig2009-05-082-6/+1
| | | | | | | | | | | | Qt itself was O2 from 4.2 and up, this changes it for applications as well. Reviewed-by: nrc
| * fix WinCE buildMaurice Kalinowski2009-05-081-0/+2
| | | | | | | | Reviewed-by: thartman
| * Merge branch '4.5'Thiago Macieira2009-05-0732-168/+471
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| | * Fixed a problem that caused QPrintDialog to invalidate QPrinter.Trond Kjernåsen2009-05-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | When passing a printer that is set up to print to a PDF file into QPrintDialog, the print dialog could invalidate the printer and not update the validity of it in a proper manner. Task-number: 252873 Reviewed-by: Samuel
| | * Whitespace fixAnders Bakken2009-05-071-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-079-15/+10
| | | | | | | | | | | | Reviewed-by: nrc
| | * Added types to the list.Morten Engvoldsen2009-05-071-0/+10
| | | | | | | | | | | | | | | | | | Added two missing types to the list. Task-number: 252274
| | * handle the back soft key on Windows mobile SmartPhonesJoerg Bornemann2009-05-072-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | We must tell the system that we want to intercept the back key on Windows mobile. Each toplevel widget that needs correct back key behaviour needs to have a menu bar. Why? Ask Microsoft... Task-number: 248846 Reviewed-by: thartman
| | * Make the error dialogs less annoying. Show only one instead of many.kh2009-05-071-11/+37
| | |
| | * Fixed some inconsistencies for image drawing on non-integer coords.Samuel Rødal2009-05-073-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for 1x1 source rect image drawing in change ffbb3c1a2aee4134dce80cd144a26bf32865b698 was incorrect for transforms with type >= TxScale. The aliased coordinate delta needs to be applied in device coordinates, not in logical coordinates. Also specialize the non-antialiased TxScale case by simply calling fillRect_normalized directly, avoiding having to scan convert the rectangle manually. Task-number: 251561 Reviewed-by: Trond
| | * fix parsing cookies in multiple linesPeter Hartmann2009-05-072-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original patch by Benjamin Meyer. Handle multiple cookies split by new lines in a cleaner way. Parsing the combined string was error prone. Splitting them and sending each line through our header parser is more robust, and has more obvious code paths. Tested by logging into wordpress.com, facebook.com etc. Reviewed-by: Thiago Task-number: 251959
| | * Win: QLineEdit not updating correctly when embedded in Graphics ViewBjoern Erik Nilsen2009-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates triggered by the line edit itself, i.e. cursor blinking, are not processed after the top-level is resized. This is yet another problem caused by the event dispatcher on Windows (Qt posted events are not sent during top-level resize, task 146849). We added a work-around for that particular case by posting an event via Windows, but the widget is not visible on the screen (hidden from Windows' POV) so it'll never be posted. And of course then we'll never receive it and the backing store is not synced. This work-around is therefore useless for widgets that are not visible on the screen. However, not receiving update requests while resizing the top-level (in this case QGraphicsView), is not a problem for embedded widgets because all items and hence the proxied widgets are repainted by graphics view anyways. Task-number: 252400 Reviewed-by: Olivier
| | * qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-078-343/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
| | * Ensure that small and mini spin boxes are drawn correctly.Norwegian Rock Cat2009-05-071-39/+57
| | | | | | | | | | | | | | | | | | | | | | | | When we fixed the stuff for normal spin boxes, we neglected to tweak the small and mini variants. We now adjust pixels for them as well. Task-number: 252301 Reviewed-by: Jens Bache-Wiig
| | * Implement new cmd option to remove the full text search index.kh2009-05-073-0/+46
| | |
| | * Fix strange context menu related bug on Windows MobileThomas Hartmann2009-05-071-2/+7
| | | | | | | | | | | | | | | | | | | | | Fixes 245347 again and does not trigger 252319 Task-number: 245347 Reviewed-by: Maurice
| | * Cleanup, no functional change.kh2009-05-071-48/+79
| | |
| | * Fix OpenSSL dynamic loading on OpenBSD.Thiago Macieira2009-05-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenBSD's OpenSSL libraries are linked in a bizarre way: libssl.so doesn't link to libcrypto.so, even though it depends on it. I don't claim to understand why, but they do it. So make sure we export its symbols for libssl to see and we load libcrypto first. Task-number: 252042 Patch by: Marc Espie <espie@openbsd.org> Reviewed-by: Peter Hartmann
| | * Make QNetworkProxy calculate the capabilities for a new proxy typeThiago Macieira2009-05-072-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you write: QNetworkProxy proxy; proxy.setType(QNetworkProxy::HttpProxy); Then now QNetworkProxy will set the capabilities to the default value for the new proxy type. Previously, it wouldn't do that: default values were set only for the type passed in the constructor. Reviewed-by: Peter Hartmann
| | * Clarify documentation in QNetworkProxy about SOCKS5 supporting domainThiago Macieira2009-05-071-4/+5
| | | | | | | | | | | | | | | | | | name resolution Task-number: 252761
| | * Make QDBusPendingCallWatcher emit a signal if it is created on anThiago Macieira2009-05-072-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | already-finished call. This fixes a bit of a "surprise" when calling a local method (which returns and finishes immediately) or when by accident calling a function that returns QDBusReply instead of QDBusPendingCall/Reply. Reviewed-by: Trust Me
| | * Fix configure error on Mac with "-arch x86"Morten Sørvig2009-05-071-1/+0
| | | | | | | | | | | | | | | | | | | | | STRING="${STRING/x86/i386}" actually replaces whole words only, so we don't need to fixup x86_64 afterwards. Reviewed-by: nrc
| | * Use proper ways to create "window" surfaceAnders Bakken2009-05-061-9/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Fix treeview test with some styleOlivier Goffart2009-05-071-1/+4
| | | | | | | | | | | | the skulpture style (from KDE) always set ScrollByPixel
| * | spanning columns did not have ViewItemPosition ↵Olivier Goffart2009-05-072-4/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | QStyleOptionViewItemV4::OnlyOne set The new autotest tests lots of the flags of the QStyleOption Reviewed-by: Thierry Task-number: 252616
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMartin Smith2009-05-076-259/+299
| |\ \
| | * | Reduced memory footprint of QGraphicsWidget.jasplin2009-05-075-259/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit reduces the memory footprint of QGraphicsWidget by around 40% (from around 663 bytes to around 409 bytes - measured using /proc/<pid>/statm on Linux - see 'man 5 proc'). The technique used is to lazily allocate (on the heap) certain data structures (i.e. not allocate them unless they are needed): - QGraphicsLayoutItemPrivate::userSizeHints => used only if the size, width, or height is explicitly set - QGraphicsWidgetPrivate::margins => used only if the contents margins are accessed - QGraphicsWidgetPrivate::windowFrameMargins => used only if the window frame margins are accessed - QGraphicsWidgetPrivate::windowData => used only if the graphics widget is a window In addition, a few unused data members (and related code) were removed: - QGraphicsWidgetPrivate::contentsRect - QGraphicsWidgetPrivate::mouseDelta - QGraphicsWidgetPrivate::*LayoutItemMargin Reviewed-by: andreas Task-number: 251592
| | * | Slim down WebKit import a bit moreSimon Hausmann2009-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove v8 JS bindings. Reviewed-by: Trust me