Hi Oliver, I prepare two patches to build QMS on Ubuntu 14.04 LTS and Linux Mint 17 with system wide Qt 5.2
*0001-Make-CMAKE_PREFIX_PATH-more-configurable.patch* - Make setting CMAKE_PATH_PREFIX more configurable. CMAKE_PATH_PREFIX is a list of pathes so it need to be set in appropriate way. *0002-Fix-compilation-with-Qt-5.2-on-Ubuntu-14.04-and-Linu.patch* - Change QDataStream::Qt_5_3 to QDataStream::Qt_5_2. Regards documentation ( http://qt-project.org/doc/qt-5/qdatastream.html#Version-enum) it has same value. Oliver, is it possible not use Qt 5.3 specific features but 5.2 one? -- WBR, Alexander Drozdov http://htrd.su
From 4d34c1306f266755c92382f49974c7978765cd33 Mon Sep 17 00:00:00 2001 From: Alexander Drozdov <[email protected]> Date: Mon, 27 Oct 2014 22:18:47 +1000 Subject: [PATCH 1/2] Make CMAKE_PREFIX_PATH more configurable --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c14e84..f05c840 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(QMapShack) # has to be removed later on if(UNIX) -set(CMAKE_PREFIX_PATH /opt/Qt/5.3/gcc_64) +set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /opt/Qt/5.3/gcc_64) endif(UNIX) @@ -13,7 +13,7 @@ if(WIN32) set(QT_DEV_PATH "" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.3\\msvc2013_64") set(GDAL_DEV_PATH "" CACHE PATH "Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal") set(PROJ_DEV_PATH "" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ") -set(CMAKE_PREFIX_PATH ${QT_DEV_PATH}) +set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DEV_PATH}) endif(WIN32) -- 1.9.1
From 5e6b6eb38660b73281c711ed0779c51f01020516 Mon Sep 17 00:00:00 2001 From: Alexander Drozdov <[email protected]> Date: Mon, 27 Oct 2014 22:20:56 +1000 Subject: [PATCH 2/2] Fix compilation with Qt 5.2 on Ubuntu 14.04 and Linux Mint 17 Change QDataStream::Qt_5_3 to QDataStream::Qt_5_2. Its same according documentation: http://qt-project.org/doc/qt-5/qdatastream.html#Version-enum --- src/gis/CGisSerialization.cpp | 12 ++++++------ src/gis/IGisItem.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gis/CGisSerialization.cpp b/src/gis/CGisSerialization.cpp index dd63bc8..fcec668 100644 --- a/src/gis/CGisSerialization.cpp +++ b/src/gis/CGisSerialization.cpp @@ -242,7 +242,7 @@ QDataStream& CGisItemTrk::operator>>(QDataStream& stream) QByteArray buffer; QDataStream out(&buffer, QIODevice::WriteOnly); out.setByteOrder(QDataStream::LittleEndian); - out.setVersion(QDataStream::Qt_5_3); + out.setVersion(QDataStream::Qt_5_2); out << key; out << flags; @@ -284,7 +284,7 @@ QDataStream& CGisItemTrk::operator<<(QDataStream& stream) QDataStream in(&buffer, QIODevice::ReadOnly); in.setByteOrder(QDataStream::LittleEndian); - in.setVersion(QDataStream::Qt_5_3); + in.setVersion(QDataStream::Qt_5_2); in >> key; in >> flags; @@ -328,7 +328,7 @@ QDataStream& CGisItemWpt::operator<<(QDataStream& stream) QDataStream in(&buffer, QIODevice::ReadOnly); in.setByteOrder(QDataStream::LittleEndian); - in.setVersion(QDataStream::Qt_5_3); + in.setVersion(QDataStream::Qt_5_2); in >> key; in >> flags; @@ -344,7 +344,7 @@ QDataStream& CGisItemWpt::operator>>(QDataStream& stream) QByteArray buffer; QDataStream out(&buffer, QIODevice::WriteOnly); out.setByteOrder(QDataStream::LittleEndian); - out.setVersion(QDataStream::Qt_5_3); + out.setVersion(QDataStream::Qt_5_2); out << key; out << flags; @@ -392,7 +392,7 @@ QDataStream& CGisItemOvlArea::operator<<(QDataStream& stream) QDataStream in(&buffer, QIODevice::ReadOnly); in.setByteOrder(QDataStream::LittleEndian); - in.setVersion(QDataStream::Qt_5_3); + in.setVersion(QDataStream::Qt_5_2); in >> key; in >> flags; @@ -418,7 +418,7 @@ QDataStream& CGisItemOvlArea::operator>>(QDataStream& stream) QByteArray buffer; QDataStream out(&buffer, QIODevice::WriteOnly); out.setByteOrder(QDataStream::LittleEndian); - out.setVersion(QDataStream::Qt_5_3); + out.setVersion(QDataStream::Qt_5_2); out << key; out << flags; diff --git a/src/gis/IGisItem.cpp b/src/gis/IGisItem.cpp index f6051c4..f98ae71 100644 --- a/src/gis/IGisItem.cpp +++ b/src/gis/IGisItem.cpp @@ -168,7 +168,7 @@ void IGisItem::changed(const QString &what, const QString &icon) QDataStream stream(&event.data, QIODevice::WriteOnly); stream.setByteOrder(QDataStream::LittleEndian); - stream.setVersion(QDataStream::Qt_5_3); + stream.setVersion(QDataStream::Qt_5_2); *this >> stream; } @@ -191,7 +191,7 @@ void IGisItem::setupHistory() { QDataStream stream(&event.data, QIODevice::WriteOnly); stream.setByteOrder(QDataStream::LittleEndian); - stream.setVersion(QDataStream::Qt_5_3); + stream.setVersion(QDataStream::Qt_5_2); *this >> stream; } -- 1.9.1
------------------------------------------------------------------------------
_______________________________________________ Qlandkartegt-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
