Commit Graph

1512 Commits

Author SHA1 Message Date
Lars Knoll
9ebdc333a6 Introduce a paged paintdevice and use it
Introduce a QPagedPaintDevice class that has a
newPage() method and page dimensions. QPdfWriter
and QPrinter inherit from it.
Add a bit of API to QPdfWriter.

Change-Id: Ibf23e7fe741f3a5ed854faf5d249a272acc75f35
Reviewed-on: http://codereview.qt.nokia.com/3206
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-19 09:16:12 +02:00
Lars Knoll
64f94fa373 move printing related files into their own directory
This is done to prepare the next step where we move
printing into it's own module.

Change-Id: I95919c28079983e7c5e4ff23d223f8c062b8ac8c
Reviewed-on: http://codereview.qt.nokia.com/3205
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-19 09:16:03 +02:00
Lars Knoll
e0972ba5ed PDF doesn't require the alpha paintengine
Remove the inheritance from the alpha paint engine
for the PDF generator. The alpha engine was only
required to support transparency on Postscript.

Change-Id: If09a00a3123f73e4c36f708651a3abae014187a3
Reviewed-on: http://codereview.qt.nokia.com/3204
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-19 09:15:55 +02:00
Lars Knoll
2df117b8ad Move the remaining QPrinter dependencies out of qpf.*
Change-Id: I4fd0158d65afad1bc67c52eff17ce2e12ff60641
Reviewed-on: http://codereview.qt.nokia.com/3203
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-19 09:15:46 +02:00
Lars Knoll
941de7608b Rename QPdf(Base)Engine
Rename QPdfBaseEngine to QPdfEngine and QPdfEngine
to QPdfPrintEngine. This fit's better with the use cases.

Change-Id: Ic208b079581768a957f9fdcc333f0bf87f619d46
Reviewed-on: http://codereview.qt.nokia.com/3202
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-19 09:15:37 +02:00
Lars Knoll
b91d30eae1 Move the PDF related functionality into QPdf
Goal is to have all functionality related to PDF generation
in QPdf, and then separate out the parts related to
interfacing with the printing system into the pdf printengine.

Change-Id: I8c30cb65365c503945fc270fad5cbcaabe59495d
Reviewed-on: http://codereview.qt.nokia.com/3201
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-19 09:15:28 +02:00
Lars Knoll
8f47da7b8f first version of a public API to generate PDFs
The class is required to be able to move the printing
subsystem out into a module of it's own.

Change-Id: I80703b8a8725504c7e6884a34f76e0735efcf95a
Reviewed-on: http://codereview.qt.nokia.com/3200
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-19 09:15:19 +02:00
Lars Knoll
9ed282eeee Move QColorMap into QtWidgets
Remove the remaining dependency in qnativeimage
and move the whole class into QtGui for compatibility.

The class is not needed anymore since we're not going
to support 8bit/indexed displays going forward.

Change-Id: I7b5f1b2a5661db4ed77bb3801039114c7518512d
Reviewed-on: http://codereview.qt.nokia.com/3199
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-19 09:15:04 +02:00
Friedemann Kleint
0b8d080421 Add Windows to the Lighthouse.
Add an initial Lighthouse plugin for the Windows operating system.

Change-Id: I6934562266e1aa0ac270bf6107df05a9e56ef82c
Reviewed-on: http://codereview.qt.nokia.com/3107
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-18 12:00:46 +02:00
Gunnar Sletta
6136a792bc Enable multisampling and swap interval by default on cocoa
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>
2011-08-18 10:14:35 +02:00
Morten Sorvig
48ba733fcf Set the style mask manually.
Looks like the window flags conversion code from
Qt 4 is not working, set a style mask suitable
for qmlscene for now.

Change-Id: I5e672f586045a0f0403f6b75252f0029c8d8a205
Reviewed-on: http://codereview.qt.nokia.com/2956
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-18 09:52:15 +02:00
Morten Sorvig
4e6c4d50a5 Fix crash-on-exit in qmlscene.
Take control over NSWindow deletion to make sure
it's lifetime matches that of the QCocoaWindow.

Change-Id: Ia10006d814345356e6aebe7fa1f9a0e012535786
Reviewed-on: http://codereview.qt.nokia.com/2960
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-18 09:50:06 +02:00
Morten Sorvig
c9d1adb7fa Create NSWindow subclass.
Allows us to override canBecomeKeyWindow etc.

Change-Id: Ia74006ac85acb98e8a0fe0a8cdc8e5e0b9aee5c4
Reviewed-on: http://codereview.qt.nokia.com/2955
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-18 09:46:57 +02:00
Morten Sorvig
6fce65f871 Cocoa: Remove autorelease warnings from qmlscene.
The SG Canvas render thread was creating a
QCocoaGLContext without an autorelease pool in
place.

Change-Id: I08882f42efdf905107497e8be21f2a2d20c3c4cf
Reviewed-on: http://codereview.qt.nokia.com/2911
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-18 09:44:48 +02:00
Olli Werwolff
c402d35df8 Readded (and fixed) WindowsXP and -Vista styles
There are still issues in WindowsVista style and qwizard_win's icon will
not be shown but these will be fixed in upcoming commits.

Change-Id: I22705694f07bea7461333b053804a09bab661706
Reviewed-on: http://codereview.qt.nokia.com/3073
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-17 13:30:28 +02:00
Gunnar Sletta
a957a88542 compile after removal of OpenGL 1 paint engine
Change-Id: Idf030ef627329f940e8a1e0a2b98d49b11e8446c
Reviewed-on: http://codereview.qt.nokia.com/3087
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-17 12:15:31 +02:00
Paul Olav Tvete
78056064cc Build fix after setPreferredPaintEngine was removed
Change-Id: I286529e0e1917ee3c808eba7dad0957dd4d8194f
Reviewed-on: http://codereview.qt.nokia.com/3083
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-17 11:59:53 +02:00
Gunnar Sletta
801450dfa3 Make configure work again..
Change-Id: I40d840c079a89fd127cf2d8ab97c1f8f3cb6525f
Reviewed-on: http://codereview.qt.nokia.com/3065
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-08-17 08:21:29 +02:00
Samuel Rødal
0d5170256c Get rid of OpenGL 1.x engine and platform code from QtOpenGL.
Change-Id: I646b8e26d5e7214432a044866764d57cc11b2390
Reviewed-on: http://codereview.qt.nokia.com/3006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-16 15:44:26 +02:00
Samuel Rødal
06f6b71ba4 Don't set platform input context if it's not properly created.
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>
2011-08-16 15:38:48 +02:00
Samuel Rødal
1ff94e3148 Get rid of unused convenience class in QtOpenGL.
QGLContextResource is no longer used, QGLContextGroupResource should be
preferable in all situations.

Change-Id: I7c7b90686959ced9fa34e278ef5747a7c49a5b03
Reviewed-on: http://codereview.qt.nokia.com/3005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-16 13:53:13 +02:00
Morten Sorvig
30774e9552 Cocoa: Fix flicker on window resize.
During window resizing the geometry change events
must be processed before returning from the event
handler.

New API: QWindowSystemInterface::handleSynchronousGeometryChange,
similar to handleGeometryChange but sends the event
immediately instead of queueing it.

Change-Id: I7dc809b3fd2e8a933c100fef3f5144972f46e363
Reviewed-on: http://codereview.qt.nokia.com/2993
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
2011-08-16 09:36:43 +02:00
Olli Werwolff
7589bdc720 Disable WindowsXP/-Vista styles for now
As these styles need functionality from qregion_win
we disable them for now.

Change-Id: I0d5d38f2f684d1ee619967341849d891d17c75e6
Reviewed-on: http://codereview.qt.nokia.com/2964
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-15 14:45:26 +02:00
Olli Werwolff
24612bcb0f Fix typo in qapplication test
Change-Id: I84f1257e3483a629ea8cfca041710bdbfbd8f3ba
Reviewed-on: http://codereview.qt.nokia.com/2963
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-15 14:45:17 +02:00
Olli Werwolff
48e525efac Fixed compilation of qfiledialog_win.cpp
Change-Id: I2c84d8f55df5a35b1cc335fdb59a27f2d3d3bad6
Reviewed-on: http://codereview.qt.nokia.com/2962
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-15 14:45:02 +02:00
Jørgen Lind
d34b0eb633 Fix platformsupport as installable module
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
2011-08-11 15:20:17 +02:00
Morten Sorvig
cbce0088bb Cocoa: Set child window geometry correctly.
Qt child window geometry is in the parent window
coordinate space, convert from/to OS X screen
coordinates when needed.

Change-Id: I50d35dd35e51af8fc161ec363c0e996a0e8aa9f3
Reviewed-on: http://codereview.qt.nokia.com/2859
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-11 13:22:36 +02:00
Morten Sorvig
9ff59c4ef4 Configure: Make QPA default when building on OS X
Minimal patch to change the default. PLATFORM_MAC
is now obsolete, and at some point we need to go
through configure and remove it or replace usages
with for example BULD_ON_MAC.

Change-Id: Ic6a8609158b6021ead23d8731e683ef3a51cc4d7
Reviewed-on: http://codereview.qt.nokia.com/2780
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-08-11 13:17:15 +02:00
Morten Sorvig
845291ba19 Cocoa: Activate Qt apps on startup.
This prevents Qt apps from launching behind the
terminal and QProcess parent apps, which is the
native OS X but not the cross-platform Qt behavior.

This reverses the change made mid 4.x series and
reverts back to the "old" Qt 4 behavior

Change-Id: I99d9f95980db884f8614ec2df663305505e08531
Reviewed-on: http://codereview.qt.nokia.com/2858
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-11 12:38:07 +02:00
Gunnar Sletta
3c36a52e1b include .cc and .CC in fix headers script
Change-Id: Ie8903d59013535e04537c1a5b50fa710a02cb8f0
Reviewed-on: http://codereview.qt.nokia.com/2849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-08-11 12:18:48 +02:00
Gunnar Sletta
46c9f4c212 Implement "quit on last window closed" logic for QWindow
Change-Id: Ide33578ad60796f3e267b09be76cda87eaf873d0
Reviewed-on: http://codereview.qt.nokia.com/2827
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-11 08:20:55 +02:00
Samuel Rødal
73769d85ec Don't try to use IBUS when dbus is not configured.
Change-Id: I315ef3d834e923b649e4306866666549852c254f
Reviewed-on: http://codereview.qt.nokia.com/2825
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
2011-08-10 14:31:13 +02:00
Samuel Rødal
ac26ac4650 Removed unnecessary debug output in xcb plugin.
Change-Id: I3b354a8649971a5d8c68a0b4f6bbdf6475116d65
Reviewed-on: http://codereview.qt.nokia.com/2808
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-08-10 08:35:50 +02:00
Samuel Rødal
24c7776c62 Made QWindow::setVisible() send show and hide events.
Change-Id: Ideae15f7bd6801d7afe2354627c0893b0b6a32ca
Reviewed-on: http://codereview.qt.nokia.com/2741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-10 08:17:41 +02:00
Matthew Cattell
2ac6eb142e build without dbus
Change-Id: I5af35ff094bea08c83f0e65e72efa59adac2581c
Reviewed-on: http://codereview.qt.nokia.com/2790
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-09 18:05:34 +02:00
Samuel Rødal
d9a95fb6a0 Removed Q_XCB_NOOP's from QGLXContext.
QGLXContext might be used from different threads than the gui thread, so
don't trigger any XCB logging from there.

Change-Id: I96a51ebf6987749d209b447c9ae2ac8b7298bd4c
Reviewed-on: http://codereview.qt.nokia.com/2782
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-09 16:11:03 +02:00
Samuel Rødal
44ad7a7f2b Removed QPaintDevice dependency in blitFramebuffer().
Change-Id: I7294be5c4447d7e24dda95b822a9ce7b2abbccc4
Reviewed-on: http://codereview.qt.nokia.com/2783
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-09 16:10:28 +02:00
Gunnar Sletta
f66065f281 Get linux input plugin compiling by removing keyboard support
Change-Id: I46ade27b5dde6c8d326a84e94abbbde1435889f8
Reviewed-on: http://codereview.qt.nokia.com/2765
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-09 09:20:56 +02:00
Gunnar Sletta
a36f23292b make eglfs compile
Change-Id: I724b700ed87cbc5d69647032c0c9c8e7e1d82748
Reviewed-on: http://codereview.qt.nokia.com/2689
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-08 09:58:34 +02:00
Gunnar Sletta
5c435189d4 Implement map/unmap and force geometry EglFS
Change-Id: Ia2d86e84acfeb30f41b06f106b93033fe54ed839
Reviewed-on: http://codereview.qt.nokia.com/2730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-08 09:28:01 +02:00
Samuel Rødal
e09d427baf Properly initialize window properties in xcb plugin.
Since 833090abb9 these need to be called manually.

Change-Id: Iabc263d499e724d4d39c3d8350563feb57749879
Reviewed-on: http://codereview.qt.nokia.com/2704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-05 16:35:44 +02:00
Samuel Rødal
ca1ad7e9a5 Get wayland plugin working after latest QPA API changes.
Change-Id: If54e7068aaed84fe765b887250bca79c787bd8a3
Reviewed-on: http://codereview.qt.nokia.com/2684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-05 16:34:35 +02:00
Samuel Rødal
6b728caee4 Get rid of missing qmake warning.
Change-Id: I470e89cb5b2042cda1811ef327e0703c7510fd08
Reviewed-on: http://codereview.qt.nokia.com/2683
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-05 12:32:42 +02:00
Gunnar Sletta
2a682d2418 Added some convenience to QWindow
Change-Id: I367f5e3f586661322184cfa5f7653814569cb6e3
Reviewed-on: http://codereview.qt.nokia.com/2611
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-05 10:42:47 +02:00
Friedemann Kleint
8dc2f81c9f Add WindowStateChanged event.
Not currently considering activation state.

Change-Id: Iea9265d35536947b6cc85639bd9839e9fda69bdf
Reviewed-on: http://codereview.qt.nokia.com/2609
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-05 10:41:43 +02:00
Gunnar Sletta
7d07ca2488 Undefine "slots" before including cocoa headers to make it compile
Change-Id: Id2ba9d657a93e0d10b70b31b6a44a6ea9f598d8f
Reviewed-on: http://codereview.qt.nokia.com/2328
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-05 10:38:17 +02:00
Jørgen Lind
0d9cac597e Fix wayland config test
Change-Id: Ifb002fdcec8ce359e3393c9f9fa2809e136d782c
Reviewed-on: http://codereview.qt.nokia.com/2600
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-04 15:01:22 +02:00
Jørgen Lind
6ea63bf028 compile fix for compiling without ssl
Change-Id: I48942dd437f9475c8584d5aef176f71464ae86be
Reviewed-on: http://codereview.qt.nokia.com/2598
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-04 15:01:11 +02:00
Jørgen Lind
673160b9fd Merge "Merge remote branch 'gerrit/master' into refactor" into refactor 2011-08-04 09:14:17 +02:00
Andy Nichols
9a652ed802 Initial support for Qt using Kernel Mode-setting (KMS)
This platform plugin supports fullscreen OpenGLES2 windows on devices
that support Kernel Mode-setting.

Change-Id: I7d4077319654c13851f0ff7ec0228b7b13936382
Reviewed-on: http://codereview.qt.nokia.com/2516
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-04 09:01:03 +02:00