diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-08 21:24:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-08 21:24:26 +0200 |
| commit | 4973786f0d36fc379c7e88a20c51639e93ddea2a (patch) | |
| tree | d4d0e3cc8adc4be3aeef13bffb6907154daf95fd /src/plugins/printsupport | |
| parent | 0b17d2328592c03503c41af7d594e58233255ff5 (diff) | |
| parent | 00540a8345c35703aeaab072fd9e4727c9b61d5a (diff) | |
| download | qtbase-4973786f0d36fc379c7e88a20c51639e93ddea2a.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I04f9f2749f68c0cb5a427b8d84e43b44bb143e4d
Diffstat (limited to 'src/plugins/printsupport')
| -rw-r--r-- | src/plugins/printsupport/windows/qwindowsprintdevice.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp index b594fe9b34..af8e07edd2 100644 --- a/src/plugins/printsupport/windows/qwindowsprintdevice.cpp +++ b/src/plugins/printsupport/windows/qwindowsprintdevice.cpp @@ -39,14 +39,12 @@ # define DC_COLLATE 22 #endif -#if defined (Q_CC_MINGW) -# pragma GCC diagnostic ignored "-Wsign-compare" -#endif - QT_BEGIN_NAMESPACE #ifndef QT_NO_PRINTER +QT_WARNING_DISABLE_GCC("-Wsign-compare") + extern qreal qt_pointMultiplier(QPageLayout::Unit unit); static inline uint qwcsnlen(const wchar_t *str, uint maxlen) |