From 51021131d779f26a54c5583ee1bab4c08376c6ef Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 23 Oct 2018 20:17:29 +0200 Subject: [PATCH] Allow compile on Qt 5.5.1 or above --- CMakeLists.txt | 2 +- src/widgets/stretchheaderview.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c5d02583..c037f3992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,7 @@ if(WIN32) endif(WIN32) # QT -set(QT_MIN_VERSION 5.6.0) +set(QT_MIN_VERSION 5.5.1) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql OpenGL Xml) if(X11_FOUND) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) diff --git a/src/widgets/stretchheaderview.cpp b/src/widgets/stretchheaderview.cpp index 488c3a32a..dbb26387a 100644 --- a/src/widgets/stretchheaderview.cpp +++ b/src/widgets/stretchheaderview.cpp @@ -246,7 +246,11 @@ void StretchHeaderView::SetColumnWidth(int logical, ColumnWidthType width) { bool StretchHeaderView::RestoreState(const QByteArray& data) { QDataStream s(data); +#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) + s.setVersion(QDataStream::Qt_5_5); +#else s.setVersion(QDataStream::Qt_5_6); +#endif int magic_number = 0; s >> magic_number; @@ -310,7 +314,11 @@ QByteArray StretchHeaderView::SaveState() const { visual_indices << logicalIndex(i); } +#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) + s.setVersion(QDataStream::Qt_5_5); +#else s.setVersion(QDataStream::Qt_5_6); +#endif s << kMagicNumber; s << stretch_enabled_;