summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Remove AccessibleEx classes.Frederik Gladhorn2011-09-1513-189/+189
| | | | | | | | | | | This was a binary compatibility hack to extend the accessibility framework towards IAccessible2. Start fixing it properly. Change-Id: I82bb0daa6469930c5bf6e440c919159603d56a83 Reviewed-on: http://codereview.qt-project.org/4750 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fix missing/incorrect license headersJason McDonald2011-09-155-1/+164
| | | | | | | Change-Id: I9db33c63c951f288f7a106c3008771699662d104 Reviewed-on: http://codereview.qt-project.org/4852 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix email address in license headers.Jason McDonald2011-09-1545-45/+45
| | | | | | | Change-Id: I5abf378f91a3a8f453058f36254f04258147cc15 Reviewed-on: http://codereview.qt-project.org/4851 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix stale license headers from refactor branchJason McDonald2011-09-154-68/+68
| | | | | | Change-Id: I38cd941202641f50bf632af35165a944d03a20e3 Reviewed-on: http://codereview.qt-project.org/4848 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add missing license headers.Jason McDonald2011-09-152-0/+82
| | | | | | | Change-Id: I3ea0028dbf712b569ca00646098a729d3ac40717 Reviewed-on: http://codereview.qt-project.org/4379 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lasse Holmstedt
* Use QPlaftormInputContextFactory to load input context in Wayland pluginJoona Petrell2011-09-142-0/+13
| | | | | | | Change-Id: Icd1d934463b550f0fcdf7d58df7c4fd1acb77ad8 Reviewed-on: http://codereview.qt-project.org/4740 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix warnings received when xcb platform is ran without ibus platforminputcontextJoona Petrell2011-09-141-7/+8
| | | | | | | | | | | | | | | Warnings like QMetaObject::invokeMethod: No such method PlatformInputContext::x11FilterEvent(uint,uint,uint,bool) QMetaObject::invokeMethod: No such method PlatformInputContext::x11FilterEvent(uint,uint,uint,bool) QMetaObject::invokeMethod: No such method PlatformInputContext::x11FilterEvent(uint,uint,uint,bool) QMetaObject::invokeMethod: No such method PlatformInputContext::x11FilterEvent(uint,uint,uint,bool) Ibus is not always available and QPlatformInputContextFactory is allowed to load different input methods. Change-Id: Id498a5e024e6646e73ed4db2efe5b007e6601698 Reviewed-on: http://codereview.qt-project.org/4738 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Don't build ibus when dbus is not availablePaul Olav Tvete2011-09-141-2/+2
| | | | | | | Change-Id: I0011cae034f186f239f486f5d83635bf4d11b88d Reviewed-on: http://codereview.qt-project.org/4879 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Windows: disable the (currently broken) Windows platform pluginRohan McGovern2011-09-141-1/+4
| | | | | | | | | | | This plugin currently refers to some API which does not exist (focusObject). It has no chance to compile for anyone. Disable it until fixed. Change-Id: I3b74b61bf5f73ba06ff73375b233a4e4ca6c1678 Reviewed-on: http://codereview.qt-project.org/4843 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Windows: correctly disable ibus plugin on WindowsRohan McGovern2011-09-141-1/+1
| | | | | | | | | The correct qmake scope is `win32', not `win'. Change-Id: I148e764bbe94b6ca824a55458e080ca948dc304d Reviewed-on: http://codereview.qt-project.org/4844 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Merge branch 'refactor'Gunnar Sletta2011-09-13439-22583/+34097
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
| * Fixed race condition in xcb plugin logging (when debugging is enabled).Samuel Rødal2011-09-122-0/+4
| | | | | | | | | | | | | | Change-Id: I8fa11ba26037d8f78e7c5131326d94836d0de9d4 Reviewed-on: http://codereview.qt-project.org/4647 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * don't build ibus plugin on windows/macGunnar Sletta2011-09-121-1/+1
| | | | | | | | | | | | | | Change-Id: I932eaea19806e3ce75803cb2849d04292885fbd5 Reviewed-on: http://codereview.qt-project.org/4631 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Clang Build Fix: Cocoa platform pluginTakumi ASAKI2011-09-094-5/+5
| | | | | | | | | | | | | | | | | | | | Fix some assignment from const values to non-const without cast. Move #import to avoid compile error. Fix type mismatch. Change-Id: I93ae5cd07827b92a91093df979992616b26b14af Reviewed-on: http://codereview.qt-project.org/4536 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Make inputcontext plugin loading a bit more genericLars Knoll2011-09-083-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a create() method to the inputcontext factory that takes no arguments. Add a virtual isValid() to QPlatformInputContext to determine whether it actually works. Remove IBUS dependencies in the xcb code so that it can also load other plugins. Change-Id: I6345a845f48fd4b3cacf6d8652711b16835a235c Reviewed-on: http://codereview.qt-project.org/4487 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Fixup a few minor errors in the previous commitLars Knoll2011-09-083-8/+8
| | | | | | | | | | | | | | | | | | | | | | Methods need to be Q_INVOKABLE to be able to call them with QMetaObject::invokeMethod(). Also use the correct return type. This makes the IBUS input context work again. Change-Id: If7ed6dd8fb99f3363c4ecebb98f889ed9eeeff00 Reviewed-on: http://codereview.qt-project.org/4486 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Add plugin mechanism to load platform input contextsJoona Petrell2011-09-0816-11/+1245
| | | | | | | | | | | | | | Change-Id: I6e74fd395325445420efce4adf13e89abe8177ee Reviewed-on: http://codereview.qt-project.org/4482 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Rename ImMicroFocus to ImCursorRectangleLars Knoll2011-09-081-1/+1
| | | | | | | | | | | | | | | | | | Also set ImhMultiLine on QTextEdit Change-Id: I04a5a1d69c2048ea94c24210e2b8374f334be1b6 Reviewed-on: http://codereview.qt-project.org/4414 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * More xlib plugin fixesPaul Olav Tvete2011-09-083-28/+27
| | | | | | | | | | | | | | Change-Id: I8b8093cd9e66129dd7cc631dd36a2fb27c3d617e Reviewed-on: http://codereview.qt-project.org/4408 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Fix compile error on Mac.Takumi ASAKI2011-09-081-0/+2
| | | | | | | | | | | | | | Change-Id: I88123bc741303ff440f628f752f39486da81e426 Reviewed-on: http://codereview.qt-project.org/4358 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Make the xlib platform plugin work againPaul Olav Tvete2011-09-072-3/+3
| | | | | | | | | | | | | | Change-Id: I2921d707a7bed7cfba19e49283e3ec5eab3c449b Reviewed-on: http://codereview.qt.nokia.com/4343 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Cocoa: QMenu refactor.Morten Sorvig2011-09-0717-93/+2942
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change prepares for enabling native menus on OS X. Move code from src/widgets to cocoa: - qcocoaapplicaiton - qcocoaapplicaitondelegate - qcocoamenuloader - qcocoamenu - qmenu_mac - misc helpers to qcocoahelpers Create a QNSApplication and QCocoaApplicationDelegate at application startup. New Lighthouse API: - class QPlatformMenu - class QPlatformMenuBar - QPlatformIntegration::createPlatformMenu() - QPlatformIntegration::createPlatformMenuBar() Platforms that wants a native menu integration subclasses QPlatformMenu[|Bar] and implements the create function. The default implementation returns 0, which causes QMenu to use the standard Qt menus. This API is based on the current native menu abstraction that Mac, Wince and S60 uses in Qt 4. The main difference is that the platform classes are proper standalone classes and not #ifdeffed into QMenuPrivate. Change-Id: I3da41f80b0ae903a476937908b1f9b88014b7954 Reviewed-on: http://codereview.qt.nokia.com/4068 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Fixed symbol lookup failure with xcb when using GLX and XRender.Samuel Rødal2011-09-071-1/+1
| | | | | | | | | | | | | | Change-Id: I17870f0acd934bf6203e432d406f1717d99386ee Reviewed-on: http://codereview.qt.nokia.com/4310 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Fixed tst_QGL::partialGLWidgetUpdates.Samuel Rødal2011-09-071-2/+31
| | | | | | | | | | | | | | Change-Id: Ie37051e28b199b5d159f5be05be41efbd17fdf08 Reviewed-on: http://codereview.qt.nokia.com/4273 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Merge remote branch 'gerrit/master' into HEADSamuel Rødal2011-09-069-158/+342
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/global/qglobal.h src/gui/kernel/qplatformnativeinterface_qpa.h src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qmenu_mac.mm src/gui/widgets/qmenu_p.h src/gui/widgets/qmenubar.cpp src/gui/widgets/qmenubar_p.h src/gui/widgets/widgets.pri src/plugins/platforms/wayland/qwaylandnativeinterface.cpp src/plugins/platforms/wayland/qwaylandnativeinterface.h src/src.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp tests/auto/qstring/tst_qstring.cpp Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
| * | Propogate that the size has changedJørgen Lind2011-09-021-1/+4
| | | | | | | | | | | | | | | | | | | | | Change-Id: I73dde157e38933d39992cb4393297c0849ee1ae2 Reviewed-on: http://codereview.qt.nokia.com/4149 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * | Refactor QMouseEvent to contain the position inside the windowLars Knoll2011-09-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the default accessors for positions to localPos, windowPos and screenPos, to be explicit about their use. Introduce a QT_NO_INTEGER_EVENT_COORDINATES define so one can make sure to always use the float based coordinates. Fixup all Qt code to use the correct constructor that specifies all three coordinates. Change-Id: If4bb93b8d1e2eb2440260d99680c468706cfe68f Reviewed-on: http://codereview.qt.nokia.com/4058 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Make xcb plugin compile again.Laszlo Agocs2011-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The name of function handleExposeEvent has not changed. Change-Id: Ida4621bbf988088c0a75f1c93a3332702f0d92b7 Reviewed-on: http://codereview.qt.nokia.com/4037 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * | The XCB plugin should not rely on QT_CONFIG=opengl anymoreGunnar Sletta2011-08-312-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieeedb7eb68704df811c613873bd2fc4b77e2aa04 Reviewed-on: http://codereview.qt.nokia.com/3966 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kevin Simons <kevin.simons@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Cocoa: Fix qmlscene flicker on startup.Morten Sorvig2011-08-315-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SG render thread was racing window creation in the GUI thread, which would cause flicker if the window won the race and was shown before the SG thread had a frame ready. Send a synchronous expose event before showing the window - this will wait for the SG render thread. In addition, don't defer NSwindow creation. The GL context setup is done before the window is shown and needs a fully created window. New API: QWindowSystemInterface::handleSynchronousExposeEvent Retire: QWindowSystemInterface::handleExposeEvent Change-Id: I0bb46089d16ec4882aaac8db67b57d15e0f51531 Reviewed-on: http://codereview.qt.nokia.com/3399 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| * | Cocoa: Make the hellowindow opengl example work.Morten Sorvig2011-08-304-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You're not supposed to use NSOpenGLView and NSOpenGLContext at the same time - it's one or the other. Qmlscene worked because it was hitting the raster path that doesn't have a NSOpenGLView. Remove the NSOpenGLView path and m_windowSurfaceView. Change-Id: I10358851a94cd1780a312af09bbb7cf5db8f984f Reviewed-on: http://codereview.qt.nokia.com/3862 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Cocoa: Fix qmlscene flicker on resize.Morten Sorvig2011-08-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the GL context before sending the geometry change event to Qt. Change-Id: If331bfcc7f7b0fd4f2f24d4445c8197ec6af688f Reviewed-on: http://codereview.qt.nokia.com/3448 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| * | Make plain executables foreground processes.Morten Sorvig2011-08-294-2/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-bundled executables are started as background processes which does not have a dock icon or a task switcher entry. This is generally not what we want for Qt gui applications so change the process type. Change-Id: I0d29eb9b70655e95bc0b9500803fbf3955d264e4 Reviewed-on: http://codereview.qt.nokia.com/3387 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| * | Cocoa: Load the standard app menu.Morten Sorvig2011-08-2914-3/+511
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's now possible to quit and hide the app window using the keyboard shortcuts. The menu nib files are now stored in Qt resources, written to QDir::temp at app startup and loaded from there. This will simplify deployment compared with Qt 4 where the nibs had to be copied into the QtGui framework when deploying the app. This change also moves the mac resources (qt_menu.nib, cursors) from widgets to the cocoa plugin. Change-Id: If1d6fd353369ea4e89a9e35579906a2de7298fa2 Reviewed-on: http://codereview.qt.nokia.com/3314 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| * | Merge "Merge remote branch 'gerrit/master' into refactor" into refactorGunnar Sletta2011-08-291-1/+1
| |\ \
| | * \ Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-291-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/accessible/qaccessible.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_mac.mm src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qapplication_win.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qdnd_x11.cpp src/gui/kernel/qwidget.cpp src/gui/widgets/qlabel.cpp Change-Id: Ief9c75724d2cff89ed45f009bdee2ffc5e4395ba
| * | | | Get cocoa plugin compiling after OpenGL refactoringGunnar Sletta2011-08-292-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9de6de9e633c1355d45c0851c1df94e707b62927 Reviewed-on: http://codereview.qt.nokia.com/3721 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * | | Copy core GL functionality to QtGui with QGL -> QOpenGL naming.Samuel Rødal2011-08-2973-138/+137
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855 Reviewed-on: http://codereview.qt.nokia.com/3710 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | Always relay configure notify events from XCB plugin.Samuel Rødal2011-08-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWindow no longer sets its geometry member in setGeometry(), so it needs to happen through handleGeometryChange() from the platform plugin. Change-Id: Ia22b788c65dba4fc4b1efed1965ccd9473f1f743 Reviewed-on: http://codereview.qt.nokia.com/3709 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | directfb: Follow coding standards, add hints of memleaks, remove varsHolger Hans Peter Freyther2011-08-265-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use m_ for all member variables, document some classes that appear to lack proper destruction, remove unused variables from classes. Change-Id: Icec451149fa5d562d8d5f54cbe9a1aa1518bfc48 Reviewed-on: http://codereview.qt.nokia.com/3667 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | directfb: Convert the directfb plugin, disable the OpenGL supportHolger Hans Peter Freyther2011-08-2611-84/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL was never tested and the platform integration has changed, remove it from the build and re-enable it once one can test it. Change-Id: I70d5b5b11de06e6e999d3aae44660f11d2dbc719 Reviewed-on: http://codereview.qt.nokia.com/3666 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | xcb: Disable GLX when xcb-xlib is not present due xlib usageHolger Hans Peter Freyther2011-08-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GLX and EGL code is using DISPLAY_FROM_XCB which requires xlib support, disable GLX when when xlib is not present. Change-Id: I55126e48e52390fdcfb1348a11fbf9628d32b13c Reviewed-on: http://codereview.qt.nokia.com/3665 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | xcb: Be able to compile without xlib supportHolger Hans Peter Freyther2011-08-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use XCB types for events instead of indirectly depending on Xlib includes because of the GLX includes. Manually verified the right values. ButtonPressMask (1L<<2) XCB_EVENT_MASK_BUTTON_PRESS = 4, define ButtonReleaseMask (1L<<3) XCB_EVENT_MASK_BUTTON_RELEASE = 8, ButtonMotionMask (1L<<13) XCB_EVENT_MASK_BUTTON_MOTION = 8192, EnterWindowMask (1L<<4) XCB_EVENT_MASK_ENTER_WINDOW = 16, LeaveWindowMask (1L<<5) XCB_EVENT_MASK_LEAVE_WINDOW = 32, PointerMotionMask (1L<<6) XCB_EVENT_MASK_POINTER_MOTION = 64, GrabModeAsync 1 XCB_GRAB_MODE_ASYNC = 1 Change-Id: I1fade68947b1e2f39ca3514573c10fae7ee2dfb1 Reviewed-on: http://codereview.qt.nokia.com/3664 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | Fix some compiler warnings, shut up QIbusPlatformInputContext.Friedemann Kleint2011-08-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idadf40b2bbe53928d8577a099f38a2be0a2d6e16 Reviewed-on: http://codereview.qt.nokia.com/3640 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | | Introduce new platform capability ThreadedOpenGL.Samuel Rødal2011-08-266-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets the platform plugin advertise whether it's safe to use OpenGL from a different thread. With XCB we only advertise this if we have a reasonably new XCB libary, as older versions suffer from the xcb_wait_for_reply() blocking bug, which cause GL rendering in a separate to stall when using Mesa drivers. Change-Id: I4829df7e583a1c8aed218ae13a159d21266cc594 Reviewed-on: http://codereview.qt.nokia.com/3613 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | Move XCB event reading to a separate thread.Samuel Rødal2011-08-263-19/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work-around for bug in XCB which causes a xcb_wait_for_reply to block if xcb_poll_for_events() is called simultaneously from a different thread. If the XCB version is too old this work-around causes even more problems, so we kill two birds with one stone by only using the work-around if the XCB version has the recent xcb_poll_for_queue_event() function, which we also need to read events from a separate thread with reasonable efficiency. Change-Id: I8a899dad6ded381ce42cba0112e77da3c8aa6887 Reviewed-on: http://codereview.qt.nokia.com/3612 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | Merge "Merge branch 'master' into refactor" into refactorGunnar Sletta2011-08-2514-74/+1715
| |\ \ \
| | * \ \ Merge branch 'master' into refactorGunnar Sletta2011-08-2514-74/+1715
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
| * | | | | Remove debug outputLars Knoll2011-08-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06ca78a2b4e9baf0088465890d404a477cfd4203 Reviewed-on: http://codereview.qt.nokia.com/3572 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | | | Fix multithreaded GL renderingLars Knoll2011-08-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call XInitThread() before any other call to Xlib. Change-Id: I88d3a87bf31dab06b0a4c6a4cd1d32979cd70d4a Reviewed-on: http://codereview.qt.nokia.com/3571 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>