Merge branch 'master' of github.com:Sankore/Sankore-3.1

modified:   src/globals/UBGlobals.h
preferencesAboutTextFull
shibakaneki 13 years ago
commit e9936c453d
  1. 3
      src/globals/UBGlobals.h

@ -34,6 +34,7 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\"");
//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_ENABLE WARNINGS_ENABLE
@ -43,4 +44,4 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\"");
#endif //#ifdef Q_WS_WIN #endif //#ifdef Q_WS_WIN
#endif // UBGLOBALS_H #endif // UBGLOBALS_H

Loading…
Cancel
Save