Fix build with Qt 5.6 on Windows.
This commit is contained in:
parent
265b519aab
commit
64acbfff4c
|
@ -204,6 +204,7 @@
|
||||||
#include <QDesktopServices>
|
#include <QDesktopServices>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
#include <memory>
|
||||||
#include <QFileSystemWatcher>
|
#include <QFileSystemWatcher>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QDoubleSpinBox>
|
#include <QDoubleSpinBox>
|
||||||
|
@ -214,7 +215,6 @@
|
||||||
#include <QStyleFactory>
|
#include <QStyleFactory>
|
||||||
#include <QImageReader>
|
#include <QImageReader>
|
||||||
#include <QUuid>
|
#include <QUuid>
|
||||||
#include <chrono>
|
|
||||||
|
|
||||||
#if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
|
#if defined(Q_OS_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
|
||||||
#include <QWinTaskbarButton>
|
#include <QWinTaskbarButton>
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
#include <memory>
|
||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
#include "intern/drw_textcodec.h"
|
#include "intern/drw_textcodec.h"
|
||||||
#include "intern/dxfreader.h"
|
#include "intern/dxfreader.h"
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
#include <QtConcurrent>
|
#include <QtConcurrent>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
|
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
|
||||||
#include "../vmisc/backport/qoverload.h"
|
#include "../vmisc/backport/qoverload.h"
|
||||||
|
|
|
@ -77,6 +77,7 @@
|
||||||
#include <QUuid>
|
#include <QUuid>
|
||||||
#include <QtMath>
|
#include <QtMath>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
#if (defined(Q_CC_GNU) && Q_CC_GNU < 409) && !defined(Q_CC_CLANG)
|
#if (defined(Q_CC_GNU) && Q_CC_GNU < 409) && !defined(Q_CC_CLANG)
|
||||||
// DO NOT WORK WITH GCC 4.8
|
// DO NOT WORK WITH GCC 4.8
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
#include <QUndoStack>
|
#include <QUndoStack>
|
||||||
#include <QtDebug>
|
#include <QtDebug>
|
||||||
#include <new>
|
#include <new>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
#include "../dialogs/tools/dialoguniondetails.h"
|
#include "../dialogs/tools/dialoguniondetails.h"
|
||||||
#include "../ifc/xml/vdomdocument.h"
|
#include "../ifc/xml/vdomdocument.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
**
|
**
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
#include "vhighlighter.h"
|
#include "vhighlighter.h"
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VTextBlockData::VTextBlockData()
|
VTextBlockData::VTextBlockData()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user