Suppress warnings.
This commit is contained in:
parent
321b41c435
commit
a66b050ecd
|
@ -32,6 +32,14 @@
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||||
|
#include "qmudef.h"
|
||||||
|
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||||
|
|
||||||
|
QT_WARNING_PUSH
|
||||||
|
QT_WARNING_DISABLE_GCC("-Wunused-variable")
|
||||||
|
|
||||||
namespace Qt
|
namespace Qt
|
||||||
{
|
{
|
||||||
//static auto endl = ::endl;
|
//static auto endl = ::endl;
|
||||||
|
@ -39,6 +47,9 @@ namespace Qt
|
||||||
static auto dec = ::dec;
|
static auto dec = ::dec;
|
||||||
//static auto SkipEmptyParts = QString::SkipEmptyParts;
|
//static auto SkipEmptyParts = QString::SkipEmptyParts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // TEXT_H
|
#endif // TEXT_H
|
||||||
|
|
|
@ -29,9 +29,17 @@
|
||||||
#define TEXT_H
|
#define TEXT_H
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <QString>
|
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||||
|
#include "../vmisc/diagnostic.h"
|
||||||
|
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||||
|
|
||||||
|
QT_WARNING_PUSH
|
||||||
|
QT_WARNING_DISABLE_GCC("-Wunused-variable")
|
||||||
|
|
||||||
namespace Qt
|
namespace Qt
|
||||||
{
|
{
|
||||||
static auto endl = ::endl;
|
static auto endl = ::endl;
|
||||||
|
@ -39,6 +47,8 @@ static auto flush = ::flush;
|
||||||
static auto dec = ::dec;
|
static auto dec = ::dec;
|
||||||
static auto SkipEmptyParts = QString::SkipEmptyParts;
|
static auto SkipEmptyParts = QString::SkipEmptyParts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QT_WARNING_POP
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // TEXT_H
|
#endif // TEXT_H
|
||||||
|
|
Loading…
Reference in New Issue
Block a user