mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
2 commits
321b41c435
...
41bcc2a4b4
Author | SHA1 | Date | |
---|---|---|---|
41bcc2a4b4 | |||
a66b050ecd |
|
@ -32,13 +32,25 @@
|
||||||
|
|
||||||
#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)
|
||||||
|
|
||||||
namespace Qt
|
namespace Qt
|
||||||
{
|
{
|
||||||
//static auto endl = ::endl;
|
QT_WARNING_PUSH
|
||||||
//static auto flush = ::flush;
|
QT_WARNING_DISABLE_GCC("-Wunused-variable")
|
||||||
static auto dec = ::dec;
|
QT_WARNING_DISABLE_CLANG("-Wunused-variable")
|
||||||
//static auto SkipEmptyParts = QString::SkipEmptyParts;
|
|
||||||
}
|
//static auto endl = ::endl; // NOLINT
|
||||||
|
//static auto flush = ::flush; // NOLINT
|
||||||
|
static auto dec = ::dec; // NOLINT
|
||||||
|
//static auto SkipEmptyParts = QString::SkipEmptyParts; // NOLINT
|
||||||
|
|
||||||
|
QT_WARNING_POP
|
||||||
|
} // namespace Qt
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // TEXT_H
|
#endif // TEXT_H
|
||||||
|
|
|
@ -29,16 +29,28 @@
|
||||||
#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 <QTextStream>
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||||
|
#include "../vmisc/diagnostic.h"
|
||||||
|
#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
|
||||||
|
|
||||||
namespace Qt
|
namespace Qt
|
||||||
{
|
{
|
||||||
static auto endl = ::endl;
|
QT_WARNING_PUSH
|
||||||
static auto flush = ::flush;
|
QT_WARNING_DISABLE_GCC("-Wunused-variable")
|
||||||
static auto dec = ::dec;
|
QT_WARNING_DISABLE_CLANG("-Wunused-variable")
|
||||||
static auto SkipEmptyParts = QString::SkipEmptyParts;
|
|
||||||
}
|
static auto endl = ::endl; // NOLINT
|
||||||
|
static auto flush = ::flush; // NOLINT
|
||||||
|
static auto dec = ::dec; // NOLINT
|
||||||
|
static auto SkipEmptyParts = QString::SkipEmptyParts; // NOLINT
|
||||||
|
|
||||||
|
QT_WARNING_POP
|
||||||
|
} // namespace Qt
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // TEXT_H
|
#endif // TEXT_H
|
||||||
|
|
Loading…
Reference in a new issue