Linux and Qt 5.3.x build fixes

Author: ron

TTWatcherMain.pro

@@ -10,3 +10,6 @@ qhttpserver.file=qhttpserver/src/src.pro
 
 ttwatcher.file=src/ttwatcher.pro
 ttwatcher.depends += qhttpserver
+ttwatcher.depends += quazip
+
+

src/SlippyMap.cpp

@@ -267,7 +267,7 @@ void SlippyMap::processTile(QPoint &tp, QByteArray &data)
     }
 }
 
-QByteArray SlippyMap::loadEmptyTile()
+QByteArray & SlippyMap::loadEmptyTile()
 {
     if ( m_EmptyTileData.length() == 0 )
     {

src/SlippyMap.h

@@ -54,7 +54,7 @@ class SlippyMap: public QObject
     QNetworkDiskCache * m_Cache;
     void processTile(QPoint & tp, QByteArray & data );
     QByteArray m_EmptyTileData;
-    QByteArray loadEmptyTile();
+    QByteArray & loadEmptyTile();
 public:
     int width;
     int height;

src/bridge.cpp

@@ -1,6 +1,6 @@
 #include "bridge.h"
 #include <QDebug>
-#include <QlineF>
+#include <QLineF>
 #include <QMarginsF>
 #include <QMap>
 #include <QPolygonF>
@@ -380,7 +380,12 @@ bool Bridge::loadBridgeFiles(BridgeList &bridgeList)
 #endif
     allOk &= loadBridgeFiles(dir, bridgeList);
 
-    dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
+    dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator() ;
+#else
+    dir = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QDir::separator();
+#endif
+
     allOk &= loadBridgeFiles(dir, bridgeList);
     return allOk;
 }

src/elevation.cpp

@@ -13,7 +13,13 @@ Elevation::Elevation(const QString &basePath) :
 {
     if ( m_BasePath.length() == 0 )
     {
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
         m_BasePath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QDir::separator() + "data/";
+#else
+        m_BasePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QDir::separator() + "data/";
+#endif
+
         qDebug() << "Elevation using " << m_BasePath;
     }
 

src/settingsdialog.cpp

@@ -283,5 +283,9 @@ void SettingsDialog::on_SettingsDialog_rejected()
 
 void SettingsDialog::on_openElevationCacheButton_clicked()
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
     QDesktopServices::openUrl(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/data/");
+#else
+    QDesktopServices::openUrl(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/data/");
+#endif
 }