Commit Graph

12 Commits (81ed78c2936d569daa85bf5dcface076a36d6f2b)

Author SHA1 Message Date
Alex Trotsenko 27e08b0c40 QWin32PrintEngine: fix compilation
On MinGW32 it fails with error:

.../src/corelib/global/global.h: 1186:34: error: unused variable 'q'
...qprintengine_win.cpp: 753:5: note: in expansion of macro 'Q_Q'

Pick-to: 6.0 6.0.0
Change-Id: I8eb0e3c5b72f8542cd3bd11514b12d308481f250
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-11-20 20:30:30 +00:00
Zhang Sheng e13173c112 Adjust code format, add space after 'if'
Change-Id: Ice081c891ff7f4b766f49dd4bd5cf18c30237acf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-11-16 12:53:37 +00:00
Allan Sandfeld Jensen 94dd2cebdc Remove Qt4Compatible painting
Change-Id: Ie54206ca9b509875568f2158e229fca9cb1860a2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-11-12 08:31:18 +01:00
Allan Sandfeld Jensen b77cf10a4f Move QPolygonClipper to XCB native painting
It is the only code using it.

Change-Id: I30060a63b6621ea94ae487ec93cd857117e12a46
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2020-10-29 18:09:24 +01:00
Konstantin Ritt bb8c24e467 QFontEngine: get rid of userData() trickery
it is only used by QWin32PrintEngine and we know for sure
QWindowsFontEngine::handle() returns HFONT

Change-Id: I7656801e4642caf7df612d2f686061dca92707e0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2020-10-28 17:27:37 +03:00
Friedemann Kleint 22bf3a4511 QWindowsPrintDevice: Fix signedness warnings
Remove the warnings suppression.

Task-number: QTBUG-83259
Change-Id: I3d8852ce8f62bac9b8f6ca4e13892164fb6d4059
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-24 14:22:57 +02:00
Friedemann Kleint 90231f5ab2 QWindowsPrintDevice: Brush up the code
- Replace C-style casts, use helper wcharId() for the printer id
- Replace typedef by using
- Replace NULL by nullptr

Task-number: QTBUG-83259
Change-Id: I066ff65bf7c1e894a6c6bb19cf0334c0b83fb759
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-09-24 10:36:38 +02:00
Friedemann Kleint fb18fe0316 Windows: Build print support plugin directly into QtPrintSupport
Task-number: QTBUG-83259
Change-Id: I23042e1eb89d407692a96bfb2d6c4efdddbfb50f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-09-24 10:36:38 +02:00
Lars Schmertmann 6ce2f3f26b Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6.

Task-number: QTBUG-82978
Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2020-07-07 11:51:48 +02:00
Tor Arne Vestbø b2bd2708b6 macOS: Remove PPD deprecation warning
We're not going to replace these any time soon, so remove the warning.

Change-Id: If020d2d3cf752e9a11558a55df5d05e2d2b3c567
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-01 15:16:15 +02:00
Tor Arne Vestbø 4497cb3d85 macOS: Build print support plugin directly into QtPrintSupport
Task-number: QTBUG-83259
Change-Id: I74f60519fbccfa5f208397bf3d65f0a4f64cb6f0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-06-04 15:58:02 +02:00
Tor Arne Vestbø 7f179eff61 Move macOS print support from platform plugin into QtPrintSupport
Task-number: QTBUG-83256
Change-Id: I29044b6c3f952c259f501f94a175c8ef2cbaae55
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-06-04 01:46:27 +02:00