From 21e971995469dca3bc6eb3be9fcb56308c5ea078 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Thu, 6 Jul 2017 15:08:34 +0300
Subject: [PATCH] Fix error "QT_WARNING_PUSH does not name a type".

--HG--
branch : develop
---
 src/libs/vdxf/libdxfrw/intern/dxfreader.cpp | 1 +
 src/libs/vmisc/diagnostic.h                 | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp b/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp
index 1befcce2e..6023b548d 100644
--- a/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp
+++ b/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp
@@ -17,6 +17,7 @@
 #include "dxfreader.h"
 #include "drw_textcodec.h"
 #include "drw_dbg.h"
+#include "../vmisc/diagnostic.h"
 
 bool dxfReader::readRec(int *codeData) {
 //    std::string text;
diff --git a/src/libs/vmisc/diagnostic.h b/src/libs/vmisc/diagnostic.h
index 935d05672..a75f0e4ee 100644
--- a/src/libs/vmisc/diagnostic.h
+++ b/src/libs/vmisc/diagnostic.h
@@ -29,9 +29,11 @@
 #ifndef DIAGNOSTIC_H
 #define DIAGNOSTIC_H
 
-#include <QtGlobal>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+#include <QtCore/qcompilerdetection.h>
+
+#else
 
 /*
  * Warning/diagnostic handling
@@ -87,6 +89,6 @@
 #  define QT_WARNING_DISABLE_GCC(text)
 #endif
 
-#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+#endif // QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
 
 #endif // DIAGNOSTIC_H