Merge branch 'master' into release

Author: dg0yt

CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 
 # Project declaration
 
-project(Mapper VERSION 0.8.3 LANGUAGES CXX C)
+project(Mapper VERSION 0.8.4 LANGUAGES CXX C)
 
 if(Mapper_VERSION_DISPLAY)
 	message(STATUS "Custom version display string: \"${Mapper_VERSION_DISPLAY}\"")

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.8.3" android:versionCode="803" package="org.openorienteering.mapper" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.8.4" android:versionCode="804" package="org.openorienteering.mapper" android:installLocation="auto">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/long_app_name" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.openorienteering.mapper.MapperActivity"

android/Mapper.pro.in

@@ -41,6 +41,11 @@ CONFIG(debug, release|debug) {
 }
 
 
+versionAtLeast(QT_VERSION, 5.12) {
+  system(sed -i -e $$shell_quote(s/minSdkVersion=\"[0-9]*\"/minSdkVersion=\"16\"/) "$$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml")
+}
+
+
 # Additional configuration from packaging/custom_install.cmake
 include(mapper_libs.pri)
 

doc/manual/CMakeLists.txt

@@ -136,19 +136,26 @@ if(Mapper_MANUAL_QTHELP)
 	# Qt Help generation
 	#
 
+	find_package(Qt5Core 5.3 REQUIRED)
+	if (Qt5Core_VERSION VERSION_LESS 5.12)
+		set(qcollectiongenerator_name qcollectiongenerator)
+	else()
+		set(qcollectiongenerator_name qhelpgenerator)
+	endif()
+	
 	# Qt provides a broken Qt5::qcollectiongenerator when crosscompiling.
 	if (CMAKE_CROSSCOMPILING AND NOT TARGET Qt5::qcollectiongenerator)
 		find_program(Qt5Help_QCOLLECTIONGENERATOR_EXECUTABLE
-		  NAMES qcollectiongenerator-qt5 qcollectiongenerator
-		  DOC "The path of the Qt Assistant executable"
+		  NAMES ${qcollectiongenerator_name}-qt5 ${qcollectiongenerator_name}
+		  DOC "The path of the Qt Help collection generator executable"
 		)
-		add_executable(Qt5::qcollectiongenerator IMPORTED)
-		set_target_properties(Qt5::qcollectiongenerator PROPERTIES
+		add_executable(Qt5::${qcollectiongenerator_name} IMPORTED)
+		set_target_properties(Qt5::${qcollectiongenerator_name} PROPERTIES
 		  IMPORTED_LOCATION ${Qt5Help_QCOLLECTIONGENERATOR_EXECUTABLE}
 		)
 	elseif(NOT Qt5Help_QCOLLECTIONGENERATOR_EXECUTABLE)
 		find_package(Qt5Help REQUIRED)
-		set(Qt5Help_QCOLLECTIONGENERATOR_EXECUTABLE Qt5::qcollectiongenerator)
+		set(Qt5Help_QCOLLECTIONGENERATOR_EXECUTABLE Qt5::${qcollectiongenerator_name})
 	endif()
 
 	# Reproducible builds need a modifications to the help collection file.
@@ -265,3 +272,4 @@ if(Mapper_MANUAL_PDF)
 	  DESTINATION "${MAPPER_ABOUT_DESTINATION}"
 	)
 endif()
+

examples/complete map.omap

@@ -4899,7 +4899,7 @@ do not assume any liability!</text></object>
 </templates>
 <view>
 <grid color="#646464" display="0" alignment="0" additional_rotation="0" unit="1" h_spacing="5" v_spacing="5" h_offset="0" v_offset="0"/>
-<map_view zoom="0.707107" rotation="0" position_x="-2902" position_y="-1183"><map opacity="1" visible="true"/><templates hidden="true" count="0"/></map_view>
+<map_view zoom="0.707107" position_x="-2902" position_y="-1183"><map opacity="1" visible="true"/><templates hidden="true" count="0"/></map_view>
 </view>
 <print scale="4000" resolution="300" simulate_overprinting="true" mode="raster"><page_format paper_size="A4" orientation="portrait" h_overlap="5.00" v_overlap="5.00"><dimensions width="210.000" height="297.000"/><page_rect left="4.230" top="3.530" width="201.540" height="289.940"/></page_format><print_area left="-103.672" top="-146.153" width="201.540" height="289.940" center_area="true" single_page="true"/></print>
 </barrier>

examples/forest sample.omap

@@ -743,7 +743,7 @@ The purple line will extend a bit into the finish symbol. This is a shortcoming
 </templates>
 <view>
 <grid color="#646464" display="0" alignment="0" additional_rotation="0" unit="1" h_spacing="500" v_spacing="500" h_offset="0" v_offset="0" snapping_enabled="true"/>
-<map_view zoom="2" rotation="0" position_x="94442" position_y="62930" overprinting_simulation_enabled="true"><map opacity="1" visible="true"/><templates count="0"/></map_view>
+<map_view zoom="2" position_x="94442" position_y="62930" overprinting_simulation_enabled="true"><map opacity="1" visible="true"/><templates count="0"/></map_view>
 </view>
 <print scale="10000" resolution="600" simulate_overprinting="true" mode="raster"><page_format paper_size="Custom" orientation="portrait" h_overlap="5.00" v_overlap="5.00"><dimensions width="110.000" height="110.000"/><page_rect left="0.000" top="0.000" width="110.000" height="110.000"/></page_format><print_area left="59.639" top="18.763" width="74.685" height="65.687" center_area="true"/></print>
 </barrier>

examples/overprinting.omap

@@ -231,7 +231,7 @@ overprinting preview.</text></object>
 </templates>
 <view>
 <grid color="#646464" display="0" alignment="0" additional_rotation="0" unit="1" h_spacing="500" v_spacing="500" h_offset="0" v_offset="0" snapping_enabled="true"/>
-<map_view zoom="4" rotation="0" position_x="-25283" position_y="-43762" overprinting_simulation_enabled="true"><map opacity="1" visible="true"/><templates count="0"/></map_view>
+<map_view zoom="4" position_x="-25283" position_y="-43762" overprinting_simulation_enabled="true"><map opacity="1" visible="true"/><templates count="0"/></map_view>
 </view>
 <print scale="15000" resolution="600" simulate_overprinting="true" mode="raster"><page_format paper_size="Custom" orientation="portrait" h_overlap="5.00" v_overlap="5.00"><dimensions width="110.000" height="110.000"/><page_rect left="0.000" top="0.000" width="110.000" height="110.000"/></page_format><print_area left="-80.283" top="-98.762" width="110.000" height="110.000" center_area="true"/></print>
 </barrier>

examples/src/complete map.xmap

@@ -74838,7 +74838,7 @@ do not assume any liability!</text>
         </templates>
         <view>
             <grid color="#646464" display="0" alignment="0" additional_rotation="0" unit="1" h_spacing="5" v_spacing="5" h_offset="0" v_offset="0"/>
-            <map_view zoom="0.707107" rotation="0" position_x="-2902" position_y="-1183">
+            <map_view zoom="0.707107" position_x="-2902" position_y="-1183">
                 <map opacity="1" visible="true"/>
                 <templates hidden="true" count="0"/>
             </map_view>

examples/src/forest sample.xmap

@@ -20484,7 +20484,7 @@ The purple line will extend a bit into the finish symbol. This is a shortcoming
         </templates>
         <view>
             <grid color="#646464" display="0" alignment="0" additional_rotation="0" unit="1" h_spacing="500" v_spacing="500" h_offset="0" v_offset="0" snapping_enabled="true"/>
-            <map_view zoom="2" rotation="0" position_x="94442" position_y="62930" overprinting_simulation_enabled="true">
+            <map_view zoom="2" position_x="94442" position_y="62930" overprinting_simulation_enabled="true">
                 <map opacity="1" visible="true"/>
                 <templates count="0"/>
             </map_view>

examples/src/overprinting.xmap

@@ -7105,7 +7105,7 @@ overprinting preview.</text>
         </templates>
         <view>
             <grid color="#646464" display="0" alignment="0" additional_rotation="0" unit="1" h_spacing="500" v_spacing="500" h_offset="0" v_offset="0" snapping_enabled="true"/>
-            <map_view zoom="4" rotation="0" position_x="-25283" position_y="-43762" overprinting_simulation_enabled="true">
+            <map_view zoom="4" position_x="-25283" position_y="-43762" overprinting_simulation_enabled="true">
                 <map opacity="1" visible="true"/>
                 <templates count="0"/>
             </map_view>