CMakeLists.txt

@@ -21,7 +21,7 @@ endif()
 # Define project name and version tags
 ###############################################################################################
 # this is not only the QMS version it will be the package version, too.
-project(QMapShack VERSION 1.12.2)
+project(QMapShack VERSION 1.12.3)
 
 # FOR A RELEASE:
 # remove "development" for a release
@@ -86,7 +86,7 @@ if (APPLE)
 endif(APPLE)
 
 if(WIN32)
-    set(QT_DEV_PATH   "C:\\Qt5\\5.11.1\\msvc2017_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.11.1\\msvc2017_64")
+    set(QT_DEV_PATH   "C:\\Qt5\\5.12.1\\msvc2017_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.11.1\\msvc2017_64")
     set(GDAL_DEV_PATH "C:\\GDAL" CACHE PATH "Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal")
     set(PROJ_DEV_PATH "C:\\PROJ" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ")
     set(ROUTINO_DEV_PATH "C:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")

CMakeLists.txt.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.8.0, 2019-02-04T18:35:12. -->
+<!-- Written by QtCreator 4.8.0, 2019-02-08T16:39:21. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -67,7 +67,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ddf2b166-ef7e-4686-9e42-3b0477c5244f}</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">5</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">4</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <valuelist type="QVariantList" key="CMake.Configuration">
      <value type="QString">BUILD_FOR_LOCAL_SYSTEM:BOOL=ON</value>

changelog.txt

+V 1.12.3
+[Issue #428] natural=water not shown
+
 V 1.12.2
 [Issue #419] Add option to project to receive all newly created items
 [Issue #417] Only one line of Geocache description

debian/changelog

+qmapshack (1.12.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 08 Feb 2019 17:22:14 +0100
+
 qmapshack (1.12.2-1) unstable; urgency=medium
 
   * New upstream release.

msvc_64/QMapShack_Installer.nsi

@@ -256,7 +256,7 @@ Section "StartMenue" StartMenue
      ;Create shortcuts
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapShack.lnk" "$INSTDIR\qmapshack.exe" "" "$INSTDIR\QMapShack.ico"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapShack.lnk" "$INSTDIR\qmapshack.exe" "--style fusion" "$INSTDIR\QMapShack.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapTool.lnk" "$INSTDIR\qmaptool.exe" "" "$INSTDIR\QMapTool.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk" "https://bitbucket.org/maproom/qmapshack/wiki/Home" "" "$INSTDIR\kfm_home.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Help.lnk" "https://bitbucket.org/maproom/qmapshack/wiki/DocMain" "" "$INSTDIR\Help.ico"

msvc_64/copyfiles.bat

@@ -6,7 +6,7 @@ rem http://technet.microsoft.com/en-us/library/bb491035.aspx
 rem http://vlaurie.com/computers2/Articles/environment.htm
 
 rem Section 1.) Define path to Qt, MSVC, .... installations
-set QMSI_QT_PATH="C:\Qt5\5.11.1\msvc2017_64"
+set QMSI_QT_PATH="C:\Qt5\5.12.1\msvc2017_64"
 rem get the VC redistributable installer from https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads
 set QMSI_VCREDIST_PATH="M:\deploy_2017"
 rem set QLGTI_LIBEXIF_PATH="D:\qlgt\tools\libexif"

src/qmapshack/locale/qmapshack_es.ts

@@ -11818,7 +11818,7 @@ Si se introduce la 'palabra' entre apostrofes se busca una coincidenci
     <message>
         <location filename="../gis/db/ISetupWorkspace.ui" line="119"/>
         <source>Enable device support. When enabled the device will be automatically detected when plugged in. It&apos;s file structure will be parsed and all projects will be loaded and listed. Depending on the device QMapShack will add the necessary glue logic like to link pictures with waypoints, etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar detección del dispositivo. Si está habilitado los dispositivos GPS se detectan, se analiza su contenido y se muestran  sus elementos y proyectos. QMapShack instalará lo necesario para poder enlazar imágenes a los waypoints, etc. </translation>
     </message>
 </context>
 <context>

src/qmapshack/map/garmin/CGarminTyp.cpp

@@ -136,7 +136,7 @@ bool CGarminTyp::parseHeader(QDataStream& in)
 
 bool CGarminTyp::parseDrawOrder(QDataStream& in, QList<quint32>& drawOrder)
 {
-    if(sectOrder.dataLength == 0)
+    if(sectOrder.arraySize == 0)
     {
         return true;
     }
@@ -222,7 +222,7 @@ bool CGarminTyp::parsePolygon(QDataStream& in, QMap<quint32, polygon_property>&
 {
     bool tainted = false;
 
-    if(sectPolygons.dataLength == 0)
+    if(sectPolygons.arraySize == 0)
     {
         return true;
     }
@@ -541,7 +541,7 @@ bool CGarminTyp::parsePolyline(QDataStream& in, QMap<quint32, polyline_property>
 {
     bool tainted = false;
 
-    if(sectPolylines.dataLength == 0)
+    if(sectPolylines.arraySize == 0)
     {
         return true;
     }