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/testlib | |
| parent | 0b17d2328592c03503c41af7d594e58233255ff5 (diff) | |
| parent | 00540a8345c35703aeaab072fd9e4727c9b61d5a (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I04f9f2749f68c0cb5a427b8d84e43b44bb143e4d
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qxctestlogger.mm | 7 |
1 files changed, 4 insertions, 3 deletions
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 |