From 39b1bd8f45b9d1e0f2db0cd0d410d64422ffd992 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 19 Feb 2013 16:50:02 +0100 Subject: undef B0 to build on PPC (conflict with definition in termios.h) This is the same fix that was already done in qprinter.h /usr/include/bits/termios.h:122:#define B0 0000000 /* hang up */ so the compiler sees B0 as a numeric constant Task-number: QTBUG-29704 Change-Id: I2df5e1783f3142558cbc1606e0c61fcf636f2de8 Reviewed-by: David Faure (KDE) --- src/gui/painting/qpagedpaintdevice.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/gui') diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h index 02ed2583ee..b2b53d8038 100644 --- a/src/gui/painting/qpagedpaintdevice.h +++ b/src/gui/painting/qpagedpaintdevice.h @@ -48,6 +48,9 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#if defined(B0) +#undef B0 // Terminal hang-up. We assume that you do not want that. +#endif class QPagedPaintDevicePrivate; -- cgit v1.2.3 From 3f99983e76d359cb45b15ae96150d4cc798b61c7 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Tue, 22 Jan 2013 10:19:49 +0100 Subject: Fix focus handling of native child widgets in xcb. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If4d596195624011142bff6853849a23064e478df Reviewed-by: Samuel Rødal (cherry picked from commit fc663b5f9aae16fe6a03160e3eb148a5f742ac58) --- src/gui/kernel/qwindow_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gui') diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index ed34693faa..6933c892a0 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -120,6 +120,8 @@ public: return offset; } + virtual QWindow *eventReceiver() { Q_Q(QWindow); return q; } + QWindow::SurfaceType surfaceType; Qt::WindowFlags windowFlags; QWindow *parentWindow; -- cgit v1.2.3 From 7203e88084a313fb6e7a96b9080f965e3ffcd89f Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 18 Feb 2013 23:19:57 +0100 Subject: Don't enable HIDPI when rendering directly to PDF on Mac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When rendering to PDF using the PDF paint engine on Mac it would consider it to be rendering as HIDPI when ScreenResolution was used. This would mean nothing was being rendered at all in the PDF as a result. Task-number: QTBUG-28709 Change-Id: Ieb97ca9d0b47f6b96debbcf5e05e96c39292e412 Reviewed-by: Morten Johan Sørvig --- src/gui/painting/qpainter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 0811b5282f..786136d203 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -229,7 +229,7 @@ QTransform QPainterPrivate::hidpiScaleTransform() const { #ifdef Q_OS_MAC // Limited feature introduction for Qt 5.0.0, remove ifdef in a later release. - if (device->physicalDpiX() == 0 || device->logicalDpiX() == 0) + if (device->devType() == QInternal::Printer || device->physicalDpiX() == 0 || device->logicalDpiX() == 0) return QTransform(); const qreal deviceScale = (device->physicalDpiX() / device->logicalDpiX()); if (deviceScale > 1.0) @@ -1843,7 +1843,7 @@ bool QPainter::begin(QPaintDevice *pd) #ifdef Q_OS_MAC // Limited feature introduction for Qt 5.0.0, remove ifdef in a later release. - const bool isHighDpi = (d->device->physicalDpiX() == 0 || d->device->logicalDpiX() == 0) ? + const bool isHighDpi = (pd->devType() == QInternal::Printer || d->device->physicalDpiX() == 0 || d->device->logicalDpiX() == 0) ? false : (d->device->physicalDpiX() / d->device->logicalDpiX() > 1); #else const bool isHighDpi = false; -- cgit v1.2.3