Recompiling QtWidgets on Mac fails with:
"ld: duplicate symbol qInitResources_qprintdialog() in
.obj/debug-shared/qrc_qprintdialog.o and
.obj/debug-shared/qprintdialog_unix.o "
Ifdef out the include from qprintdialog_unix,
leaving us with one instance of the synbol.
Change-Id: I7e1f45de65020253e0cad4155fca94944e66c177
Reviewed-on: http://codereview.qt.nokia.com/3270
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
No longer initialize FormatOptions to SwapBehaviour::DoubleBuffer
in the constructor as it is a different enumeration.
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Change-Id: Id69e0345d4395ee88532ac3ee0e89c35e6c5b083
Reviewed-on: http://codereview.qt.nokia.com/3254
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
It's now unused since the GL1 paintengine is gone.
Change-Id: I1415b725dc05aab920670976a8eb8c3145464297
Reviewed-on: http://codereview.qt.nokia.com/3246
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Type1 support was only required for postscript
generation. As we don't support this anymore, get
rid of this code.
Change-Id: Ifdc27ec563b5da8d94554f8b078bcd3ac079d201
Reviewed-on: http://codereview.qt.nokia.com/3214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Add a margin method to QPagedPaintDevice. The other variables
required are stored in QPagedPaintDevicePrivate without a
public API for now. This needs cleaning up once we have a new
printing system.
Change-Id: Id3f2d7ac7f3cbce8619072a897d91f3a588add64
Reviewed-on: http://codereview.qt.nokia.com/3211
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
QPlatformIntegration can't have a dependency onto printing
anymore now that printing lives in it's own library. Move
it into a plugin of it's own.
Change-Id: I3ec4b38f4336eb96d92ea799544d17af359c83e1
Reviewed-on: http://codereview.qt.nokia.com/3210
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
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>
Use the QPagedPaintDevice instead for the current
print() methods. Like this we can move the whole
printing system into it's own library.
Change-Id: I5e23fb3a9304eb3d12aa54959893601566249e23
Reviewed-on: http://codereview.qt.nokia.com/3208
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
This is required to be able to move the printing system into
it's own library.
Change-Id: If70a55be4c4413f9cd917a30d1b368f32c1145e4
Reviewed-on: http://codereview.qt.nokia.com/3207
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
