WSL/SLF GitLab Repository

Commit 84453d48 authored by Mathias Bavay's avatar Mathias Bavay
Browse files

More fixes for Qt>5.14 and specially preparing for Qt6

parent a17737c5
......@@ -25,6 +25,13 @@
#include <QMessageBox>
#include <QTextStream>
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace Qt
{
static auto endl = ::endl;
}
#endif
/**
* @class Error
* @brief Default constructor for an Error message.
......
......@@ -37,14 +37,6 @@
#include <QtXmlPatterns/QAbstractMessageHandler>
#include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace Qt
{
static auto endl = ::endl;
static auto SkipEmptyParts = QString::SkipEmptyParts;
}
#endif
namespace html {
QString bold(const QString &text);
......
......@@ -46,6 +46,13 @@
#include <iostream>
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace Qt
{
static auto SkipEmptyParts = QString::SkipEmptyParts;
}
#endif
#ifdef DEBUG_TIMERS
#include <QElapsedTimer>
#endif //def DEBUG_TIMERS
......
......@@ -26,6 +26,13 @@
#include <QStringList>
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace Qt
{
static auto SkipEmptyParts = QString::SkipEmptyParts;
}
#endif
/**
* @class Checklist
* @brief Default constructor for a Checklist panel.
......
......@@ -23,6 +23,15 @@
#include <src/main/inishell.h>
#include <src/panels/dynamic_panels.h>
#include <QStringList>
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
namespace Qt
{
static auto SkipEmptyParts = QString::SkipEmptyParts;
}
#endif
#ifdef DEBUG
#include <iostream>
#endif //def DEBUG
......
Supports Markdown
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