diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-04-07 02:50:26 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-04-07 13:09:48 +0000 |
| commit | 3a845e4b4f308888ea1e3849d6bb03bccce99e43 (patch) | |
| tree | 1157173c91d15534fb15ff89700238189ddb5c9a | |
| parent | 237cb0d082b5518cecf42f1a2186134799de745e (diff) | |
Use QT_WARNING_.. instead of #pragma GCC diagnostic ..
Change-Id: I0bb55a7f1074f3b8d6fb681b1d4dab5105ae7569
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/tools/qarraydata.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/printsupport/windows/qwindowsprintdevice.cpp | 6 | ||||
| -rw-r--r-- | src/testlib/qxctestlogger.mm | 7 |
4 files changed, 12 insertions, 21 deletions
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp index 513d9b4ae3..ef15fae83a 100644 --- a/src/corelib/tools/qarraydata.cpp +++ b/src/corelib/tools/qarraydata.cpp @@ -38,10 +38,8 @@ QT_BEGIN_NAMESPACE -#if defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) && !defined(Q_CC_INTEL) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wmissing-field-initializers" -#endif +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers") const QArrayData QArrayData::shared_null[2] = { { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, sizeof(QArrayData) }, // shared null @@ -52,9 +50,7 @@ static const QArrayData qt_array[3] = { { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, sizeof(QArrayData) }, // unsharable empty /* zero initialized terminator */}; -#if defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) && !defined(Q_CC_INTEL) - #pragma GCC diagnostic pop -#endif +QT_WARNING_POP static const QArrayData &qt_array_empty = qt_array[0]; static const QArrayData &qt_array_unsharable_empty = qt_array[1]; diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index d5708e4f9c..d1c0249116 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -1104,18 +1104,14 @@ QFontEngine *QWindowsFontDatabase::fontEngine(const QByteArray &fontData, qreal GUID guid; CoCreateGuid(&guid); -#ifdef Q_CC_GNU -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wstrict-aliasing" -#endif +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wstrict-aliasing") QString uniqueFamilyName = QLatin1Char('f') + QString::number(guid.Data1, 36) + QLatin1Char('-') + QString::number(guid.Data2, 36) + QLatin1Char('-') + QString::number(guid.Data3, 36) + QLatin1Char('-') + QString::number(*reinterpret_cast<quint64 *>(guid.Data4), 36); -#ifdef Q_CC_GNU -# pragma GCC diagnostic pop -#endif +QT_WARNING_POP QString actualFontName = font.changeFamilyName(uniqueFamilyName); if (actualFontName.isEmpty()) { 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) diff --git a/src/testlib/qxctestlogger.mm b/src/testlib/qxctestlogger.mm index 576f46acea..833e566af5 100644 --- a/src/testlib/qxctestlogger.mm +++ b/src/testlib/qxctestlogger.mm @@ -58,8 +58,9 @@ - (NSString *)nameForLegacyLogging; @end -#pragma GCC diagnostic push // Ignore XCTestProbe deprecation -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +QT_WARNING_PUSH +// Ignore XCTestProbe deprecation +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") // --------------------------------------------------------- @@ -498,4 +499,4 @@ bool QXcodeTestLogger::isActive() return s_currentTestLogger; } -#pragma GCC diagnostic pop +QT_WARNING_POP |