Skip to content

O
OpenBoard
Commit 7508d9ea authored by Aleksei Kanash's avatar Aleksei Kanash
Browse files
Options

Fix to NO_THIRD_PARTY_WARNINGS macro.

parent 8fb0036b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
Sankore_3.1.pro
View file @ 7508d9ea
...@@ -35,7 +35,6 @@ QT += script ...@@ -35,7 +35,6 @@ QT += script
QT += xmlpatterns QT += xmlpatterns
INCLUDEPATH += src INCLUDEPATH += src
INCLUDEPATH += globals
include($$THIRD_PARTY_PATH/libs.pri) include($$THIRD_PARTY_PATH/libs.pri)
include(src/adaptors/adaptors.pri) include(src/adaptors/adaptors.pri)
......
src/globals/UBGlobals.h
View file @ 7508d9ea
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
// just save old state (needs for not empty define) // just save old state (needs for not empty define)
#define THIRD_PARTY_WARNINGS_DISABLE __pragma(warning(push)); #define THIRD_PARTY_WARNINGS_DISABLE __pragma(warning(push));
#endif //#ifdef NO_THIRD_PARTY_WARNINGS #endif //#ifdef NO_THIRD_PARTY_WARNINGS
// anyway on WIN
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#else //#ifdef Q_WS_WIN #else //#ifdef Q_WS_WIN
...@@ -33,15 +31,16 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\""); ...@@ -33,15 +31,16 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\"");
#ifdef NO_THIRD_PARTY_WARNINGS #ifdef NO_THIRD_PARTY_WARNINGS
//disabling some warnings //disabling some warnings
#define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE #define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#else #else
// just save old state (needs for not empty define) // just save old state (needs for not empty define)
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE #define THIRD_PARTY_WARNINGS_DISABLE _Pragma("GCC diagnostic push");
#endif //#ifdef NO_THIRD_PARTY_WARNINGS #endif //#ifdef NO_THIRD_PARTY_WARNINGS
#endif //#ifdef Q_WS_WIN #endif //#ifdef Q_WS_WIN
// anyway on any OS
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#endif // UBGLOBALS_H #endif // UBGLOBALS_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment