summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix race condition between QEventLoop::exec and QThread::exitOlivier Goffart2011-02-073-2/+13
| | | | | | | As also mentioned in QTBUG-16692 Reviewed-by: brad Task-number: QTBUG-17257
* Remove QThreadData::mutexOlivier Goffart2011-02-071-2/+0
| | | | | | which does not seem to be used. Reviewed-by: Brad
* QNAM: Delete old fileMarkus Goetz2011-02-041-84/+0
| | | | | Forgot to delete this file. Since 4.8 we use the QNetworkReplyDataImpl instead of a QNetworkAccessDataBackend
* QNAM: Move authentication cache to separate classMarkus Goetz2011-02-046-245/+424
| | | | | | | | Also make the authentication cache thread-safe by using a mutex and making QNetworkAuthenticationCredential a value-class. Reviewed-by: thiago
* Implement QThreadData::current using __threadOlivier Goffart2011-02-031-3/+20
| | | | | | | It slightly faster, and QThreadData::current is used everywhere Reviewed-by: mread Reviewed-by: Joao
* Crash in QFileSystemEngine::canonicalName with older libc versionOlivier Goffart2011-02-021-2/+3
| | | | | | | | | | Crashed on OpenBSD. POSIX.1-2001 says that the behavior if resolved_path is NULL is implementation-defined. POSIX.1-2008 specifies that the it can be NULL Reviewed-By: Markus Goetz
* Fix leak in QFactoryLoaderOlivier Goffart2011-02-021-1/+3
| | | | We need to release the library in case of errors
* Fixed "not a valid preprocessing token" on GCCE.axis2011-02-011-1/+1
| | | | | | It seems to be fixed upstream already. RevBy: Gareth Stockwell
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-313957-8245/+22533
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-01-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.
| | * Merge remote branch 'qt-fire-review/master'aavit2011-01-281-1/+1
| | |\
| | | * Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.Samuel Rødal2011-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made toHsl() work the same way as toHsv(), ensuring the hue gets set to USHRT_MAX and not 0. Task-number: QTBUG-16530 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | Cocoa/Alien: fix qgraphicseffectsource autotestRichard Moe Gustavsen2011-01-281-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test discovered a serious bug where we for alien widgets on mac returned a zero sized paintdevice. The reason is that we used to ask the nsview backing the widget for its size, but with alien, there where no such view. Very strange that this was not seen visually for any of the many applications tested. This patch does the same implementation strategy as found in QWidget::metric in qwidget_x11.cpp
| * | | Cocoa: fix qgraphicsview autotestRichard Moe Gustavsen2011-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the cursor to the corner of the desktop (0, 0) will typically trigger things to happend in the OS, at least on Mac (spaces, synergy etc). So I changed those tests to move it to (1, 1) instead. The reason to move it to (0, 0) was just to get the mouse away from the window anyway. And second, it takes some time after using QCursor::setPos on Mac before the events from the move actually arrive. And many tests that use this function relies on this. So I introduces a little delay. This alone will fix a couble of tests.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-2725-1303/+1773
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-2625-1303/+1773
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-2625-1303/+1773
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | | | * | Cocoa: non-native toolbar shows in window when hiddenRichard Moe Gustavsen2011-01-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that we explicitly needs to tell it to hide which we do in the init function. But since QToolBar overrides setVisible, this fails. This patch makes sure we call the super version of the function
| | | | * | Cocoa: disable scroll optimization for certain casesRichard Moe Gustavsen2011-01-252-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No reason to use the optimization when only scrolling in one direction. In those cases we are better off scrolling immidiatly when requested to minimize the shuffling of scrolls and repaints done by the application
| | | | * | Merge remote branch 'qt-water-staging/master' into alien-merged-mainlineRichard Moe Gustavsen2011-01-258-227/+295
| | | | |\ \
| | | | * | | Cocoa: fix scroll optimization bugRichard Moe Gustavsen2011-01-243-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The optimization commited a few commits before this one faulty stopped normal dispatching of enter/leave. This patch fixes this.
| | | | * | | Cocoa: add scroll optimization when scrolling both hor and verRichard Moe Gustavsen2011-01-244-0/+70
| | | | | | |
| | | | * | | Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4Richard Moe Gustavsen2011-01-242-4/+2
| | | | | | |
| | | | * | | Cocoa: remove compiler warningRichard Moe Gustavsen2011-01-241-2/+1
| | | | | | |
| | | | * | | Add support for disabling touch on to enhance scrolling in CocoaRichard Moe Gustavsen2011-01-248-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac/Cocoa, enabling touch on a widget slows down the scrolling performance of the whole application. It seems Cocoa spends some time in the background figuring out what to do with the touch events, and whether or not it should convert them to scroll/wheel events. Therefore, it makes sense to no subscribe for touch when the mouse is not over the widget, This patch implements that strategy, and the effect is huge when tested agains creator. Rev-By: brad
| | | | * | | Cocoa/Alien: replace depricated APIRichard Moe Gustavsen2011-01-211-1/+1
| | | | | | |
| | | | * | | Cocoa/Alien: remove unneded code for scrolling with alienRichard Moe Gustavsen2011-01-211-6/+1
| | | | | | |
| | | | * | | Cocoa/Alien: keep the scrolling within correct boundsRichard Moe Gustavsen2011-01-212-26/+11
| | | | | | |
| | | | * | | Cocoa/Alien: bugfix scrolling, dirty region issueRichard Moe Gustavsen2011-01-211-45/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scrolling a widget we also need to scroll the already marked dirty regions on the widget along with the scroll. Since we might end up scrolling several time before a drawRect is called (normal with inertia scrolling), we need to mark exposed areas during scrolling as dirty as well, so they get handled correctly on subsequent scrolls.
| | | | * | | Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgetsRichard Moe Gustavsen2011-01-202-5/+25
| | | | | | |
| | | | * | | Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)Richard Moe Gustavsen2011-01-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we alien is in use, several of the auto tests are that needed special handling for mac before, are now expected to pass. Which they also do. This patch turns them on :)
| | | | * | | Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engineRichard Moe Gustavsen2011-01-191-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In setGeometry_sys we used to call invalidateBuffer. This function does not take into account widgets with static contents when resizing. invlidateBuffer_resizeHelper does. The new code with this patch will make setGeometry_sys work the same way as in qwidget_x11::setGeometry_sys.
| | | | * | | Merge remote branch 'alien-on-cocoa/master' into alien-merged-mainlineRichard Moe Gustavsen2011-01-186-16/+30
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges alien feature branch with Qt master/mainline Conflicts: src/gui/kernel/qt_cocoa_helpers_mac.mm
| | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Richard Moe Gustavsen2011-01-173968-12311/+30937
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alien-squached Conflicts: src/gui/kernel/qcocoasharedwindowmethods_mac_p.h src/gui/kernel/qcocoaview_mac.mm src/gui/kernel/qwidget_mac.mm
| | | | * | | | | Alien implementation for the Cocoa portRichard Moe Gustavsen2011-01-1724-1283/+1641
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give Alien on Cocoa a warm welcome.
| * | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-01-2789-1546/+7848
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (69 commits) Lighthouse: License headers to new files in testlite Make sure we blit the fbo on flush in QGLWindowSurface Lighthouse: Wayland. Make the wayland integration closer to Lighthosue Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice Making clearer separation between responsibility of different classes Make it possible to vertically mirror gl painting Lighthouse:Wayland Moving some logic into files Fix Wayland plugin to work with Wayland after some interfaces changed Make QGLContext::fromPlatformGLContext show correct sharing Remove Lighthouse specific code from QGLWindowSurface Fix X11 clipboard bug. Fix for uninitialized member in QWaylandCursor wayland: use pkgconfig for libdrm in wayland.pro wayland: remove non-public header from config.tests wayland: fix SOURCES to point to wayland.cpp in config.tests Wayland: request rbg and premultiplied argb visuals as needed Wayland: clamp window resizes to screen size Wayland: split GL code into separate files Wayland: use correct viewport for swapBuffers and correct coords Wayland: fix geometry of swapBuffers ...
| | * \ \ \ \ \ \ \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-263873-5338/+11818
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Lighthouse: License headers to new files in testliteJørgen Lind2011-01-2611-1/+411
| | | | | | | | | |
| | * | | | | | | | Make sure we blit the fbo on flush in QGLWindowSurfaceJørgen Lind2011-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: sroedal
| | * | | | | | | | Lighthouse: Wayland. Make the wayland integration closer to LighthosueJørgen Lind2011-01-2613-39/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Today there is a connection between QWidget and QPlatformScreen. So I added a accessor in QWaylandScreen to get the corresponding QWaylandDisplay. So now it should be possible to have different QWaylandDisplays. But also its possible to use the internal Lighthouse api closer in the wayland plugin if that should be of interest ;)
| | * | | | | | | | Lighthouse: Wayland, only make one fbo for the WaylandPaintDeviceJørgen Lind2011-01-262-87/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually the fbo belongs to the QWaylandPaintDevice, which also holds n QWaylandDrmBuffers. Then the QWaylandDrmWindowSurface gets the current drmbuffer used on flush and attaches it to the window and calls wl_surface_damage
| | * | | | | | | | Making clearer separation between responsibility of different classesJørgen Lind2011-01-2615-327/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ie. Moving code into different files and refactoring some of the classes. The Drmbuffer was most affected. It has a depth and stencil buffer. QWaylandGLContext contain the context. The drm buffer class has to be bound to the context before used.
| | * | | | | | | | Make it possible to vertically mirror gl paintingJørgen Lind2011-01-263-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GLPaintDevice gets a flip property. If this is set, the pvr matrix is altered to paint "upside down" Reviewed-by: sroedal
| | * | | | | | | | Lighthouse:Wayland Moving some logic into filesJørgen Lind2011-01-2617-631/+1081
| | | | | | | | | |
| | * | | | | | | | Fix Wayland plugin to work with Wayland after some interfaces changedJørgen Lind2011-01-252-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | such as wl_display_create -> wl_display_connect wl_surface_attach (attributes) wl_surface_map -> wl_surface_map_toplevel wl_shell_listener wl_output_listener
| | * | | | | | | | Make QGLContext::fromPlatformGLContext show correct sharingJørgen Lind2011-01-254-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information. Prior to this, if a context was created with QGLWidget it would setup the sharing correct, but all sharing actually created on a QPlatformGLContext level was ignored by the QGLContext, thus indicating that it wasnt sharing with any other context.
| | * | | | | | | | Remove Lighthouse specific code from QGLWindowSurfaceJørgen Lind2011-01-251-7/+1
| | | | | | | | | |
| | * | | | | | | | Fix X11 clipboard bug.Jørgen Lind2011-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truth be told, the x11 clipboard integration in testlite was done rather quickly, thus leaving some cornercases open
| | * | | | | | | | Fix for uninitialized member in QWaylandCursorRolf Offermanns2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch Qt applications will crash the moment the mouse pointer enters the window. Signed-off-by: Rolf Offermanns <roffermanns@sysgo.com>
| | * | | | | | | | wayland: use pkgconfig for libdrm in wayland.proBenjamin Franzke2011-01-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On this system the IncludePath for drm.h was missing So maybe pkgconfig should be additionally also used for libxkbcommon, EGL and GLESv2 to prevent such problems. but i dont know whether its common to use pkg-config in qmake