aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error "QT_WARNING_PUSH does not name a type".

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-07-06 15:08:34 +03:00
parent f701cc95f9
commit 21e9719954
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/vdxf/libdxfrw/intern/dxfreader.cpp
View File

@ -17,6 +17,7 @@
#include "dxfreader.h" #include "dxfreader.h"
#include "drw_textcodec.h" #include "drw_textcodec.h"
#include "drw_dbg.h" #include "drw_dbg.h"
#include "../vmisc/diagnostic.h"
bool dxfReader::readRec(int *codeData) { bool dxfReader::readRec(int *codeData) {
// std::string text; // std::string text;

8
src/libs/vmisc/diagnostic.h
View File

@ -29,9 +29,11 @@
#ifndef DIAGNOSTIC_H #ifndef DIAGNOSTIC_H
#define 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 * Warning/diagnostic handling
@ -87,6 +89,6 @@
# define QT_WARNING_DISABLE_GCC(text) # define QT_WARNING_DISABLE_GCC(text)
#endif #endif
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #endif // QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
#endif // DIAGNOSTIC_H #endif // DIAGNOSTIC_H