mirror of
https://github.com/ONLYOFFICE/desktop-apps.git
synced 2026-04-07 14:09:22 +08:00
Merge pull request 'Fix build' (#421) from fix/linux-build into release/v9.1.0
This commit is contained in:
@ -6,6 +6,7 @@
|
||||
#include <QFile>
|
||||
#include <QSettings>
|
||||
#include <QTranslator>
|
||||
#include <QRegularExpression>
|
||||
#include <list>
|
||||
#include <algorithm>
|
||||
|
||||
|
||||
@ -31,7 +31,11 @@ void CLogger::write(const QString &value)
|
||||
out.setCodec("UTF-8");
|
||||
#endif
|
||||
if ( m_file ) {
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
|
||||
out << text << Qt::endl;
|
||||
#else
|
||||
out << text << endl;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -51,6 +51,9 @@
|
||||
#include "cascapplicationmanagerwrapper.h"
|
||||
#include "qdpichecker.h"
|
||||
#include "common/File.h"
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
|
||||
# include <QDesktopWidget>
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <QDesktopServices>
|
||||
|
||||
Reference in New Issue
Block a user