From aeb7e3914e612a9473440a504d5e86dc387178fb Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 7 Jan 2019 19:04:53 +0100 Subject: [PATCH] Allow compile with Qt 5.5 again --- CMakeLists.txt | 2 +- src/widgets/stretchheaderview.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64fbaabb1..7ca08cf2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,7 @@ if(WIN32) endif(WIN32) # QT -set(QT_MIN_VERSION 5.6) +set(QT_MIN_VERSION 5.5) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Concurrent Widgets Network Sql) 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 37cdd0995..78113b946 100644 --- a/src/widgets/stretchheaderview.cpp +++ b/src/widgets/stretchheaderview.cpp @@ -247,7 +247,11 @@ 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; @@ -311,7 +315,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;