summaryrefslogtreecommitdiffstats
path: root/src/platformsupport
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash in QPlatformInputContextFactory.Samuel Rødal2011-09-121-1/+1
| | | | | | | | | If ic is null we shouldn't dereference it. Change-Id: Idf472c799f8207d893f15a55fac330ea20ec451c Reviewed-on: http://codereview.qt-project.org/4639 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-121-19/+22
| | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
* Make inputcontext plugin loading a bit more genericLars Knoll2011-09-082-2/+30
| | | | | | | | | | | | | | 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>
* Add plugin mechanism to load platform input contextsJoona Petrell2011-09-0816-1033/+209
| | | | | | | 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>
* MicroFocus is in item coordinatesLars Knoll2011-09-082-10/+13
| | | | | | | | | | | Always set the microFocus/cursorRectangle in item coordinates. Correctly update the itemTransform in the QInputPanel for QWidgets. Change-Id: Ic0187f808996f31e6238d934f43bc97a70522a55 Reviewed-on: http://codereview.qt-project.org/4402 Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Refactor the input frameworkLars Knoll2011-09-072-15/+24
| | | | | | | | | | | | | | | | Results of the ongoing workshop in Oslo: QInputPanel will be the application facing interface for controlling the input context as well as querying things like the position of the virtual keyboard. QInputContext is significantly cleaned up and only there as a compatibility API for existing code. Change-Id: Ie8e2ee480930763f414bfaae63247b1fb6500c82 Reviewed-on: http://codereview.qt.nokia.com/4357 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Mac: make platformsupport a static libMorten Sorvig2011-09-014-13/+5
| | | | | | | | | | | | | | | The "force framework/no-framework" logic does not really work, since Qt is now a mix of frameworks and statics libs. Remove this code path and use the "detection" path instead. Also remove the exports from platformsupport. Change-Id: I0a308666480445eb47c4f443ff7529addecad10d Reviewed-on: http://codereview.qt.nokia.com/3464 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.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-292-4/+4
| | | | | | Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855 Reviewed-on: http://codereview.qt.nokia.com/3710 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix some compiler warnings, shut up QIbusPlatformInputContext.Friedemann Kleint2011-08-262-14/+25
| | | | | | Change-Id: Idadf40b2bbe53928d8577a099f38a2be0a2d6e16 Reviewed-on: http://codereview.qt.nokia.com/3640 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Support QRawFont from raw data with basic unix font dbEskil Abrahamsen Blomfeldt2011-08-252-0/+67
| | | | | | | | | | | | Add support for making a QFontEngine in QPA with the basic unix font database. The code is copy-pasted from qrawfont_ft.cpp. Task-number: QTBUG-20780 Change-Id: Id5492efe634fe90805fbca43356ec428d4d73117 Reviewed-on: http://codereview.qt.nokia.com/3511 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Just change includes to be have <> brackets instead of ""Jørgen Lind2011-08-241-2/+2
| | | | | | | | | for QGenericFontDatabase Change-Id: Iac61522194ab7aa3ea7359e51cc84952db8b90ae Reviewed-on: http://codereview.qt.nokia.com/3471 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Fix fallbacksForFamily in QBasicUnixFontDatabaseJiang Jiang2011-08-242-2/+2
| | | | | | | | | | | | So that this function instead of the one in QPlatformFontDatabase will be called. Change-Id: Ifdb75ada27723c688e42067c7633b08391d66467 Reviewed-on: http://codereview.qt.nokia.com/2696 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/3461 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix weight parsing in QBasicUnixFontDatabaseJiang Jiang2011-08-241-0/+27
| | | | | | | | | | | | | First check the usWeightClass in OS/2 font table, then check the weight byte in panose structure because Nokia Pure Text fonts only have that set correctly. Change-Id: Idce2626c8df17ce74ba78b317846cb42c3f1fe84 Reviewed-by: Jørgen Lind Reviewed-on: http://codereview.qt.nokia.com/2682 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/3460
* Move printing into it's own libraryLars Knoll2011-08-193-2/+4
| | | | | | | | | | | | Create a libQtPrintSupport library that contains our current printing infrastructure. Long term this will get replaced with a libQtPrint, as the current architecture is not really maintainable. Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2 Reviewed-on: http://codereview.qt.nokia.com/3209 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Enable multisampling and swap interval by default on cocoaGunnar Sletta2011-08-181-0/+3
| | | | | | | Change-Id: If3d1939e6196f5aa6654645d20dab7ad251046fa Reviewed-on: http://codereview.qt.nokia.com/3138 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Don't set platform input context if it's not properly created.Samuel Rødal2011-08-162-0/+7
| | | | | | | | | | Prevent xcb applications from failing to launch when IBus is not initialized correctly. Change-Id: I8425403e02d0eb5401f8d8bb0d012b53ab9400d9 Reviewed-on: http://codereview.qt.nokia.com/3044 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Fix platformsupport as installable moduleJørgen Lind2011-08-111-2/+4
| | | | | | | Change-Id: I17c4723c551c1cee9c442e8d6c1289bccf505d3d Reviewed-on: http://codereview.qt.nokia.com/2868 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andy Nichols
* ibus depends on dbusJørgen Lind2011-08-031-2/+4
| | | | | | | Change-Id: I9f38eaa84bf5befb6b37c2a55405d85b71cf4c95 Reviewed-on: http://codereview.qt.nokia.com/2543 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* More graceful choosing of EGL configs.Samuel Rødal2011-07-271-11/+18
| | | | | | | | | | | | If someone asks for a depth buffer of size 32, we should try to give them a smaller depth buffer if none of that size is available. Also, don't unconditionally read the alpha size of the configure attributes, since it might have been removed when reducing the config. Change-Id: If2f9d49c1cc3ded015384f9551b19cd15c523ce3 Reviewed-on: http://codereview.qt.nokia.com/2269 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Get the eglfs plugin compiling.Samuel Rødal2011-07-261-0/+1
| | | | | | | Change-Id: I5addb1a2593a670d559b9fbf9183f52af410895b Reviewed-on: http://codereview.qt.nokia.com/2176 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Added workable QScreen API on top of QPlatformScreen.Samuel Rødal2011-07-251-2/+0
| | | | | | | | | | | | | | | | | | | | | QPlatformIntegration::screens() no longer has to be implemented, implementations should call QPlatformIntegration::screenAdded() for each screen instead. This is for being able to support adding screens at run-time later on, by connecting it to a signal in QGuiApplication. The QGuiGLContext API has changed a bit, by not sending in all the parameters in the constructor but instead having a create() function. The createPlatformGLContext() factory in QPlatformIntegration takes a QGuiGLContext * instead of a QSurfaceFormat and a share context, similar to how the window and backing store factory functions work. The XCB plugin has experimental support for connecting to multiple X displays simultaneously, creating one or more QScreen for each. Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f Reviewed-on: http://codereview.qt.nokia.com/2103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix minimal plugin for windowsOlli Werwolff2011-07-071-1/+1
| | | | | | | Change-Id: Ica017cdad4c8205706b42767035d834498b63037 Reviewed-on: http://codereview.qt.nokia.com/1268 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix crash if IBus is not configured.Friedemann Kleint2011-06-291-3/+5
| | | | Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Compile on Mac.Morten Sorvig2011-06-281-1/+1
| | | Mac is a Unix but we probably don't want to use ibus.
* Factor out CGL code for reuse in wayland.Morten Sorvig2011-06-284-0/+171
|
* ibus IM support for the xcb backendLars Knoll2011-06-2713-1/+1106
| | | | | | | | Test code to check input methods using the ibus backend used on e.g. ubuntu. The IM code is not very sophisticated, but enough to test that things are working. Reviewed-by: Jørgen Lind
* Compile.Morten Johan Sorvig2011-06-231-1/+1
|
* Remove QEventDispatcherQPA inheritance support.Morten Sorvig2011-06-232-36/+5
| | | | | | QEventDispatcherQPA is now a small "leaf" class, there is no need to inherit from it or make it inherit another event dispatcher.
* Add QWindowSystemInterface::windowSystemEventsQueued()Morten Sorvig2011-06-232-2/+2
| | | | | | This removes the last use of QWindowSystemInterfacePrivate from outside QtGui, so we can make that class non-exported again.
* Refactor window system event dispatching.Morten Sorvig2011-06-232-52/+7
| | | | | | | | | | Add QWindowSystemInterface::sendWindowSystemEvents, which contains the canonical "empty and send queued window system events" implementation. Make the Cocoa, QPA, and GLIB dispatchers use the new implementation. Cocoa now no longer inherits from QPA.
* Remove stray file.Morten Sorvig2011-06-231-10/+0
|
* Remove leftover file.Friedemann Kleint2011-06-231-60/+0
| | | | Code went into Windows plugin.
* Remove Windows code from platform lib.Friedemann Kleint2011-06-226-270/+0
| | | | Rubber-stamped-by: Jørgen <jorgen.lind@nokia.com>
* Add QGuiEventDispatcherWin32.Friedemann Kleint2011-06-223-1/+145
| | | | | | | | Dispatches Gui events after DispatchMessage(). Reviewed-by: Samuel Rødal <sroedal@trolltech.com> Reviewed-by: Morten Sørvig <morten.sorvig@nokia.com>
* Q_GUI_EXPORT is a mac-only workaround.Morten Sorvig2011-06-221-1/+1
|
* add a platform interface for input method supportLars Knoll2011-06-221-1/+1
| | | | | | | | add QPlatformInputContext to help supporting complex text input. Communication with the focus objects/widgets will happen slightly different then before, through events instead of methods one can query on QWidget.
* Add lighthouse event dispatcher API.Morten Sorvig2011-06-229-1/+583
| | | | | | | | | | Platform plugin creation is now moved forward in order to have a platform plugin instance at event dispatcher creation time. Plugins are now responsible for implementing PlatformIntegration::createEventDispatcher and returning an QAbstractEventDispatcher subclass.
* OpenGL API refactor.Samuel Rødal2011-06-216-54/+42
| | | | | | Rename QGuiGLFormat to QSurfaceFormat, and make QWindow sub-class of QSurface and QPlatformWindow sub-class of QPlatformSurface, instead of having QPlatformGLSurface accessor in QWindow.
* Compile fix for platformsupport on Mac.Morten Sorvig2011-06-212-1/+8
| | | | | | | | | | Switch platformsupport over to be a shared library, which is well supported by the build system. This requires exporting classes we use. I've done this on OS_MAC only for now. Reverts 4581a9999e12e14bbf0836d0740191ba50109540
* Mac: buildfix for QtPlatformsupportRichard Moe Gustavsen2011-06-201-2/+3
|
* Mac: build fix. Make sure Platformsupport builds as a static lib.Richard Moe Gustavsen2011-06-201-0/+1
| | | | | | ...and not as an .app, as It did. Rev-By: Jørgen Lind
* Compile fix, and remove warningsJørgen Lind2011-06-103-4/+4
|
* Fix versionheader name for QtPlatformSupportJørgen Lind2011-06-101-1/+1
|
* QtPlatformSupport: A helper library for platform pluginsJørgen Lind2011-06-1033-0/+3703
QtPlatformSupport is a static library. Platform plugins are meant to link against this library to pull in dependencies such as fontengines and convenience functions for finding the right GL configs. The linker will only pull in the symbols used, so the size of the library doesn't really matter