Commit Graph

698 Commits (def5901955e8b4cfcb9e2cd83c7dcf9ed0508a0a)

Author SHA1 Message Date
Morten Sorvig def5901955 Reintroduce QWindow::SurfaceType
On Cocoa it makes sense to distinguish between the
two window types.

Reviewed-by: Samuel
2011-06-22 14:10:26 +02:00
Richard Moe Gustavsen 0e4844aa24 Cocoa: clean up pro file for platform plugin 2011-06-22 14:01:02 +02:00
Richard Moe Gustavsen 041b809a62 Cocoa: implement support for wheel events 2011-06-22 13:59:35 +02:00
Friedemann Kleint 111068f383 Add QGuiEventDispatcherWin32.
Dispatches Gui events after
DispatchMessage().

Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Reviewed-by: Morten Sørvig <morten.sorvig@nokia.com>
2011-06-22 13:43:47 +02:00
Friedemann Kleint 8c42defe67 Compile. 2011-06-22 12:11:55 +02:00
Morten Sorvig be4221d8fa Q_GUI_EXPORT is a mac-only workaround. 2011-06-22 12:04:03 +02:00
Morten Johan Sorvig f1975cfc53 Make xcb work again after event dispatcher changes.
The platform plugin/event dispatcher creation order
has now been reversed and the event dispatcher
cannot be accessed during plugin construciton.
2011-06-22 11:37:42 +02:00
Lars Knoll 407a6fe798 add QInputMethodQueryEvent
QInputMethodQueryEvent will replace the old
inputMethodHints() and inputMethodQuery() APIs
in QWidget. It has the advantage that it works
nicely with any kind of QObject.
2011-06-22 10:46:12 +02:00
Lars Knoll 4363d836f6 remove the plugin support for QInputContext
This will be handled through the lighthouse plugin
instead.
2011-06-22 10:46:12 +02:00
Lars Knoll e1293b49e3 add a platform interface for input method support
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.
2011-06-22 10:46:11 +02:00
Morten Johan Sorvig c23580de7b Add libxcb-xfixes0-dev to xcb deps 2011-06-22 10:07:17 +02:00
Samuel Rødal 0235b9d0a6 Compile fix (region is an accessor now, not a public member variable). 2011-06-22 09:50:47 +02:00
Morten Sorvig 4efaf305f5 Add lighthouse event dispatcher API.
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.
2011-06-22 09:47:49 +02:00
Samuel Rødal 18c1d67137 Made QExposeEvent public and added exposeEvent() in QWindow.
This is needed for applications that use QBackingStore directly.
2011-06-22 09:41:10 +02:00
Samuel Rødal 176f30b137 OpenGL API refactor.
Rename QGuiGLFormat to QSurfaceFormat, and make QWindow sub-class of
QSurface and QPlatformWindow sub-class of QPlatformSurface, instead of
having QPlatformGLSurface accessor in QWindow.
2011-06-21 14:02:22 +02:00
Richard Moe Gustavsen 272daebaa0 Cocoa: fix compiler warning 2011-06-21 13:53:21 +02:00
Richard Moe Gustavsen c477fa3e2c Cocoa: add missing return statement
Rev-By: sroedal
2011-06-21 11:49:22 +02:00
Laszlo Agocs 14a1d6d3c7 Make readback-glx working again in wayland. 2011-06-21 10:23:28 +02:00
Laszlo Agocs 31b2311818 Compile fix for readbackglx after surface->backingstore renaming. 2011-06-21 10:10:22 +02:00
Morten Sorvig ee60794a68 Compile. 2011-06-21 09:56:46 +02:00
Morten Sorvig 2e94bef1e4 Compile fix for platformsupport on Mac.
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 4581a9999e
2011-06-21 09:52:29 +02:00
Samuel Rødal cf1a53cf3c Port Cocoa plugin to new backing store interface. 2011-06-21 09:04:01 +02:00
Samuel Rødal 6ce6b8a378 Rename QWindowSurface -> QBackingStore and split into platform / public.
Also get rid of GL window surface and related classes.
2011-06-21 09:04:01 +02:00
Samuel Rødal 891a86f0f3 Compile fixes. 2011-06-21 09:04:01 +02:00
Richard Moe Gustavsen 4581a9999e Mac: buildfix for cocoa lighthouse plugin
Rev-By: msorvig
2011-06-20 14:18:26 +02:00
Richard Moe Gustavsen 1ed22cdfd3 Mac: buildfix for QtPlatformsupport 2011-06-20 14:18:26 +02:00
Lars Knoll 1c86896f53 Don't crash if Clipboard and Selection hold the same mimedate
Cliboard and Selection can hold the same QMimeData object.
Don't delete the mimedata in this case before when clearing
only one of them.

Reviewed-by: Samuel
2011-06-20 13:32:20 +02:00
Lars Knoll 7a64f12cfe use selection changed events from XFixes
properly initialize the XFixes extension and then
use the selection changed events to notify
Qt apps.

Reviewed-by: Samuel
2011-06-20 13:31:52 +02:00
Lars Knoll 8ffbdae179 remove postscript related files
We don't support postscript in Qt 5 anymore

Reviewed-by: Gunnar
2011-06-20 12:50:16 +02:00
Lars Knoll 813139f4f5 Enhance Xcb clipboard code
Some cleanup on the data structures.
Properly implement support for timestamps on each
selection.
Transfer selections to the clipboard manager on
exit if it exists.
Properly clear our selection when X11 asks us to
do so.
2011-06-20 12:50:16 +02:00
Lars Knoll fc266713cc Add a platform API for QClipboard::ownsMode()
Simply forward ownsMode() to the QPlatformClipboard.
2011-06-20 12:50:16 +02:00
Laszlo Agocs 672fe5d43c Restoring QT_WAYLAND_GL_SUPPORT ifdefs. 2011-06-20 12:21:29 +02:00
Richard Moe Gustavsen 83130d791d Mac: build fix. Make sure Platformsupport builds as a static lib.
...and not as an .app, as It did.

Rev-By: Jørgen Lind
2011-06-20 11:58:32 +02:00
Laszlo Agocs c84346ddff Make glx wayland backends working. 2011-06-20 10:30:30 +02:00
Laszlo Agocs 34d19a5571 Remove leftover xkb member variable in QXcbKeyboard. 2011-06-17 14:39:00 +02:00
Friedemann Kleint 08489ef837 Compile. 2011-06-14 09:52:10 +02:00
Jørgen Lind 297407bdc6 Autodetect the xcb backend 2011-06-10 16:09:08 +02:00
Samuel Rødal 1ee96f093a Use XCB_GRAVITY_STATIC in XCB plugin for frame independent geometry. 2011-06-10 16:05:04 +02:00
Jørgen Lind 11dc006328 Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor 2011-06-10 13:35:10 +02:00
Jørgen Lind 85a992a3f8 Compile fix, and remove warnings 2011-06-10 13:26:36 +02:00
Jørgen Lind c70efdec0f Merge remote-tracking branch 'base/master' into refactor
Conflicts:
	examples/animation/animatedtiles/animatedtiles.pro
	examples/animation/appchooser/appchooser.pro
	examples/animation/moveblocks/moveblocks.pro
	examples/animation/states/states.pro
	examples/animation/stickman/stickman.pro
	examples/dialogs/configdialog/configdialog.pro
	examples/dialogs/sipdialog/sipdialog.pro
	examples/dialogs/standarddialogs/standarddialogs.pro
	examples/dialogs/tabdialog/tabdialog.pro
	examples/draganddrop/draggableicons/draggableicons.pro
	examples/draganddrop/draggabletext/draggabletext.pro
	examples/draganddrop/fridgemagnets/fridgemagnets.pro
	examples/draganddrop/puzzle/puzzle.pro
	examples/gestures/imagegestures/imagegestures.pro
	examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
	examples/graphicsview/collidingmice/collidingmice.pro
	examples/graphicsview/elasticnodes/elasticnodes.pro
	examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
	examples/itemviews/addressbook/addressbook.pro
	examples/itemviews/chart/chart.pro
	examples/itemviews/fetchmore/fetchmore.pro
	examples/itemviews/puzzle/puzzle.pro
	examples/mainwindows/menus/menus.pro
	examples/painting/basicdrawing/basicdrawing.pro
	examples/painting/concentriccircles/concentriccircles.pro
	examples/painting/imagecomposition/imagecomposition.pro
	examples/painting/painterpaths/painterpaths.pro
	examples/painting/transformations/transformations.pro
	examples/qtconcurrent/imagescaling/imagescaling.pro
	examples/qtestlib/tutorial1/tutorial1.pro
	examples/qtestlib/tutorial2/tutorial2.pro
	examples/qtestlib/tutorial3/tutorial3.pro
	examples/qtestlib/tutorial4/tutorial4.pro
	examples/qtestlib/tutorial5/tutorial5.pro
	examples/qws/dbscreen/dbscreen.pro
	examples/qws/svgalib/svgalib.pro
	examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
	examples/statemachine/rogue/rogue.pro
	examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
	examples/tools/styleplugin/plugin/plugin.pro
	examples/uitools/multipleinheritance/multipleinheritance.pro
	examples/widgets/analogclock/analogclock.pro
	examples/widgets/calculator/calculator.pro
	examples/widgets/calendarwidget/calendarwidget.pro
	examples/widgets/codeeditor/codeeditor.pro
	examples/widgets/icons/icons.pro
	examples/widgets/imageviewer/imageviewer.pro
	examples/widgets/lineedits/lineedits.pro
	examples/widgets/movie/movie.pro
	examples/widgets/shapedclock/shapedclock.pro
	examples/widgets/softkeys/softkeys.pro
	examples/widgets/tetrix/tetrix.pro
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qpaintengine_raster_p.h
	src/openvg/openvg.pro
	src/openvg/qpaintengine_vg_p.h
	src/plugins/graphicssystems/meego/meego.pro
	src/plugins/platforms/fontdatabases/basicunix/basicunix.pri
2011-06-10 13:09:57 +02:00
Samuel Rødal 6b0cd62e5e Added frameMargins() API and support in XCB plugin. 2011-06-10 12:40:56 +02:00
Friedemann Kleint f56a905ced Compile Windows. 2011-06-10 10:41:20 +02:00
Jørgen Lind f30b8b96b8 Fix QtPlatformSupport when compiling with glx and xcb 2011-06-10 10:16:18 +02:00
Jørgen Lind dfd07cb247 Fix versionheader name for QtPlatformSupport 2011-06-10 10:11:41 +02:00
Friedemann Kleint 288bf48388 idc: Do not link against QtGui.
(which throws off the build order).
2011-06-10 10:04:22 +02:00
Jørgen Lind 2aeefdddc1 Remove the platforms/install_rules directory 2011-06-10 09:54:12 +02:00
Jørgen Lind f00f7a895b Update dependency list in xcb README 2011-06-10 09:46:56 +02:00
Jørgen Lind 6ee65dc478 QtPlatformSupport: A helper library for platform plugins
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
2011-06-10 09:46:56 +02:00
Tapani Mikola db37aa1004 Fontengine buildfix for xcb platform plugin.
Change-Id: Ic909e1ac08163e62634643c68862e802a016b911
Reviewed-on: http://codereview.qt.nokia.com/442
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-06-10 09:40:55 +02:00