From 716fdbd8b8a457a19f2ba0111f055ee45e74c692 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Fri, 12 Sep 2025 11:30:32 +0200 Subject: [PATCH 01/10] Rename input cmake variables --- .github/workflows/android.yml | 14 +++++++------- .github/workflows/ios.yml | 2 +- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/win.yml | 2 +- CMakeLists.txt | 26 +++++++++++++------------- app/CMakeLists.txt | 24 ++++++++++++------------ app/main.cpp | 8 ++++---- cmake/VersionDetect.cmake | 8 ++++---- cmake_templates/AndroidManifest.xml.in | 4 ++-- cmake_templates/inputconfig.h.in | 6 +++--- core/coreutils.cpp | 8 ++++---- core/projectchecksumcache.h | 4 ++-- 13 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 27a02d6eb..89858ffc5 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -184,7 +184,7 @@ jobs: OFFFSET: 10 # offset for build number - due to previous builds ~ new builds must always have a higher number run: | BUILD_NUM=$GITHUB_RUN_NUMBER$((GITHUB_RUN_ATTEMPT + OFFFSET)) - echo "INPUT_VERSION_CODE=${BUILD_NUM}" >> $GITHUB_ENV + echo "MM_VERSION_CODE=${BUILD_NUM}" >> $GITHUB_ENV echo "Version code: ${BUILD_NUM}" @@ -234,13 +234,13 @@ jobs: run: | mv \ ${{ github.workspace }}/build-mm/app/android-build/build/outputs/apk/release/android-build-release-signed.apk \ - ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.apk + ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk - name: Upload APK to Artifacts uses: actions/upload-artifact@v4 with: - path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.apk - name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} APK [${{ matrix.ANDROID_ABI }}] + path: ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk + name: Mergin Maps ${{ env.MM_VERSION_CODE }} APK [${{ matrix.ANDROID_ABI }}] - name: Build AAB if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} @@ -258,11 +258,11 @@ jobs: run: | mv \ ${{ github.workspace }}/build-mm/app/android-build/build/outputs/bundle/release/android-build-release.aab \ - ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab + ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab - name: Upload AAB to Artifacts if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} uses: actions/upload-artifact@v4 with: - path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab - name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} AAB [${{ matrix.ANDROID_ABI }}] + path: ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab + name: Mergin Maps ${{ env.MM_VERSION_CODE }} AAB [${{ matrix.ANDROID_ABI }}] diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 28cea9a3e..c147d04bf 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -140,7 +140,7 @@ jobs: TIMESTAMP=`date "+%y.%-m"` CF_BUNDLE_VERSION=${TIMESTAMP}.${BUILD_NUM} - echo "INPUT_VERSION_CODE=${CF_BUNDLE_VERSION}" >> $GITHUB_ENV + echo "MM_VERSION_CODE=${CF_BUNDLE_VERSION}" >> $GITHUB_ENV echo "Build number: ${CF_BUNDLE_VERSION}" # add build number to summary diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 42891b0ab..f9af3ddc8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -110,7 +110,7 @@ jobs: - name: Calculate build number run: | BUILD_NUM=$GITHUB_RUN_NUMBER$GITHUB_RUN_ATTEMPT - echo "INPUT_VERSION_CODE=${BUILD_NUM}" >> $GITHUB_ENV + echo "MM_VERSION_CODE=${BUILD_NUM}" >> $GITHUB_ENV echo "Version code: ${BUILD_NUM}" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 39e54e22d..059c58cd9 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -108,7 +108,7 @@ jobs: - name: Calculate build number run: | BUILD_NUM=$GITHUB_RUN_NUMBER$GITHUB_RUN_ATTEMPT - echo "INPUT_VERSION_CODE=${BUILD_NUM}" >> $GITHUB_ENV + echo "MM_VERSION_CODE=${BUILD_NUM}" >> $GITHUB_ENV echo "Version code: ${BUILD_NUM}" - name: build app (debug) run: | diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 6cea6b08e..2ce118f6b 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -111,7 +111,7 @@ jobs: shell: bash run: | BUILD_NUM=$GITHUB_RUN_NUMBER$GITHUB_RUN_ATTEMPT - echo "INPUT_VERSION_CODE=${BUILD_NUM}" >> $GITHUB_ENV + echo "MM_VERSION_CODE=${BUILD_NUM}" >> $GITHUB_ENV echo "Version code: ${BUILD_NUM}" - name: Setup compiler diff --git a/CMakeLists.txt b/CMakeLists.txt index e6a8d5cb0..7cb093533 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,14 +32,14 @@ if (ANDROID_ABI) set(ANDROID_ARM_NEON ON) # Target/Minimum API levels for Android, used as Input target properties - set(INPUT_ANDROID_TARGET_SDK_VERSION "35") - set(INPUT_ANDROID_MIN_SDK_VERSION "${ANDROIDAPI}") - set(INPUT_ANDROID_NDK_PATH "$ENV{ANDROID_NDK_HOME}") - if (NOT INPUT_ANDROID_NDK_PATH) + set(MM_ANDROID_TARGET_SDK_VERSION "35") + set(MM_ANDROID_MIN_SDK_VERSION "${ANDROIDAPI}") + set(MM_ANDROID_NDK_PATH "$ENV{ANDROID_NDK_HOME}") + if (NOT MM_ANDROID_NDK_PATH) message(FATAL_ERROR "Set required environment variable ANDROID_NDK_HOME.") endif () set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE - "${INPUT_ANDROID_NDK_PATH}/build/cmake/android.toolchain.cmake" + "${MM_ANDROID_NDK_PATH}/build/cmake/android.toolchain.cmake" ) endif () @@ -92,15 +92,15 @@ else () set(HAVE_BLUETOOTH_DEFAULT TRUE) endif () -if (DEFINED ENV{INPUT_VERSION_CODE}) - set(INPUT_VERSION_CODE_DEFAULT "$ENV{INPUT_VERSION_CODE}") +if (DEFINED ENV{MM_VERSION_CODE}) + set(MM_VERSION_CODE_DEFAULT "$ENV{MM_VERSION_CODE}") else () if (ANDROID) - set(INPUT_VERSION_CODE_DEFAULT "0000000") + set(MM_VERSION_CODE_DEFAULT "0000000") elseif (IOS) - set(INPUT_VERSION_CODE_DEFAULT "00.00.000000") + set(MM_VERSION_CODE_DEFAULT "00.00.000000") else () - set(INPUT_VERSION_CODE_DEFAULT "000000") + set(MM_VERSION_CODE_DEFAULT "000000") endif () endif () @@ -141,8 +141,8 @@ set(USE_KEYCHAIN "Whether to use keychains/wallets to store credentials. If false, we use QSettings" ) -set(INPUT_VERSION_CODE - "${INPUT_VERSION_CODE_DEFAULT}" +set(MM_VERSION_CODE + "${MM_VERSION_CODE_DEFAULT}" CACHE STRING "Build version (for stores)" ) @@ -312,7 +312,7 @@ add_compile_definitions("$<$:QGIS_QUICK_EXPAND_TEST_DATA>") # Generate inputconfig.h if (ENABLE_TESTS) - set(INPUT_TEST TRUE) + set(MM_TEST TRUE) file(COPY test/test_data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test/) set(TEST_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/test/test_data") endif () diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 67df0008d..5c1efb99f 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -325,7 +325,7 @@ if (ANDROID) file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml) endif () configure_file( - ${INPUT_CMAKE_TEMPLATES_PATH}/AndroidManifest.xml.in + ${CMAKE_SOURCE_DIR}/cmake_templates/AndroidManifest.xml.in ${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml @ONLY ) @@ -333,17 +333,17 @@ if (ANDROID) file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/android/build.gradle) endif () configure_file( - ${INPUT_CMAKE_TEMPLATES_PATH}/build.gradle.in + ${CMAKE_SOURCE_DIR}/cmake_templates/build.gradle.in ${CMAKE_CURRENT_SOURCE_DIR}/android/build.gradle @ONLY ) set_target_properties( Input PROPERTIES QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android - QT_ANDROID_TARGET_SDK_VERSION ${INPUT_ANDROID_TARGET_SDK_VERSION} - QT_ANDROID_MIN_SDK_VERSION ${INPUT_ANDROID_MIN_SDK_VERSION} - QT_ANDROID_VERSION_CODE ${INPUT_VERSION_CODE} - QT_ANDROID_VERSION_NAME ${INPUT_VERSION} + QT_ANDROID_TARGET_SDK_VERSION ${MM_ANDROID_TARGET_SDK_VERSION} + QT_ANDROID_MIN_SDK_VERSION ${MM_ANDROID_MIN_SDK_VERSION} + QT_ANDROID_VERSION_CODE ${MM_VERSION_CODE} + QT_ANDROID_VERSION_NAME ${MM_VERSION} ) endif () @@ -353,8 +353,8 @@ if (MACOS) PROPERTIES MACOSX_BUNDLE TRUE MACOSX_RPATH TRUE MACOSX_BUNDLE_GUI_IDENTIFIER LutraConsultingLtd.Input - MACOSX_BUNDLE_INFO_PLIST ${INPUT_CMAKE_TEMPLATES_PATH}/macOsInfo.plist.in - MACOSX_BUNDLE_SHORT_VERSION_STRING ${INPUT_VERSION_CODE} + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake_templates/macOsInfo.plist.in + MACOSX_BUNDLE_SHORT_VERSION_STRING ${MM_VERSION_CODE} XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@loader_path/Libraries" XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE ) @@ -390,7 +390,7 @@ if (IOS) ) # entitlements file - set(ENTITLEMENTS_FILE ${INPUT_CMAKE_TEMPLATES_PATH}/mm.entitlements) + set(ENTITLEMENTS_FILE ${CMAKE_SOURCE_DIR}/cmake_templates/mm.entitlements) configure_file( ${ENTITLEMENTS_FILE} ${CMAKE_CURRENT_BINARY_DIR}/mm.entitlements COPYONLY ) @@ -405,10 +405,10 @@ if (IOS) set_target_properties( Input PROPERTIES MACOSX_BUNDLE TRUE - MACOSX_BUNDLE_INFO_PLIST ${INPUT_CMAKE_TEMPLATES_PATH}/iOSInfo.plist.in + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake_templates/iOSInfo.plist.in MACOSX_BUNDLE_GUI_IDENTIFIER "LutraConsultingLtd.Input" - MACOSX_BUNDLE_SHORT_VERSION_STRING ${INPUT_VERSION} - MACOSX_BUNDLE_BUNDLE_VERSION ${INPUT_VERSION_CODE} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${MM_VERSION} + MACOSX_BUNDLE_BUNDLE_VERSION ${MM_VERSION_CODE} XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "79QMH2QRAH" XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon" XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${ENTITLEMENTS_FILE_IN_BUILD}" diff --git a/app/main.cpp b/app/main.cpp index 43df2a9f6..fd6fb917a 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -23,7 +23,7 @@ #include #include #include -#ifdef INPUT_TEST +#ifdef MM_TEST #include "test/inputtests.h" #endif #include @@ -414,7 +414,7 @@ int main( int argc, char *argv[] ) #endif -#ifdef INPUT_TEST +#ifdef MM_TEST InputTests tests; tests.parseArgs( argc, argv ); #endif @@ -426,7 +426,7 @@ int main( int argc, char *argv[] ) QString dataDir = getDataDir(); QString projectDir = dataDir + "/projects"; -#ifdef INPUT_TEST +#ifdef MM_TEST if ( tests.testingRequested() ) { projectDir = tests.initTestingDir(); @@ -678,7 +678,7 @@ int main( int argc, char *argv[] ) CoreUtils::log( QStringLiteral( "Loading project error" ), QStringLiteral( "Application has been unexpectedly finished during the last run." ) ); } -#ifdef INPUT_TEST +#ifdef MM_TEST if ( tests.testingRequested() ) { tests.initTestDeclarative(); diff --git a/cmake/VersionDetect.cmake b/cmake/VersionDetect.cmake index 66e264b6e..20142431f 100644 --- a/cmake/VersionDetect.cmake +++ b/cmake/VersionDetect.cmake @@ -2,15 +2,15 @@ # needs to be called after project() command so toolchains are already evaluated macro (mm_detect_version) - set(INPUT_VERSION ${MM_VERSION_MAJOR}.${MM_VERSION_MINOR}.${MM_VERSION_PATCH}) - set(VERSTR ${INPUT_VERSION}) + set(MM_VERSION ${MM_VERSION_MAJOR}.${MM_VERSION_MINOR}.${MM_VERSION_PATCH}) + set(VERSTR ${MM_VERSION}) string( REPLACE " " "\ " ESCAPED_VERSTR - ${INPUT_VERSION} + ${MM_VERSION} ) - set(version_desc "version name ${INPUT_VERSION}; code ${INPUT_VERSION_CODE}") + set(version_desc "version name ${MM_VERSION}; code ${MM_VERSION_CODE}") endmacro () diff --git a/cmake_templates/AndroidManifest.xml.in b/cmake_templates/AndroidManifest.xml.in index 0aa6e15a4..c8f2828c3 100644 --- a/cmake_templates/AndroidManifest.xml.in +++ b/cmake_templates/AndroidManifest.xml.in @@ -1,8 +1,8 @@ + android:versionCode="@MM_VERSION_CODE@" + android:versionName="@MM_VERSION@"> diff --git a/cmake_templates/inputconfig.h.in b/cmake_templates/inputconfig.h.in index d165bd871..76f030ce4 100644 --- a/cmake_templates/inputconfig.h.in +++ b/cmake_templates/inputconfig.h.in @@ -4,13 +4,13 @@ #define INPUT_APP #cmakedefine VERSTR "@ESCAPED_VERSTR@" -#cmakedefine INPUT_VERSION @INPUT_VERSION@ -#cmakedefine INPUT_VERSION_CODE @INPUT_VERSION_CODE@ +#cmakedefine MM_VERSION @MM_VERSION@ +#cmakedefine MM_VERSION_CODE @MM_VERSION_CODE@ #cmakedefine QGIS_QUICK_DATA_PATH @QGIS_QUICK_DATA_PATH@ #cmakedefine MM_FORMATS_PATH @MM_FORMATS_PATH@ -#cmakedefine INPUT_TEST +#cmakedefine MM_TEST #cmakedefine TEST_DATA_DIR "@TEST_DATA_DIR@" #cmakedefine HAVE_BLUETOOTH diff --git a/core/coreutils.cpp b/core/coreutils.cpp index 39255c362..5ef3026b3 100644 --- a/core/coreutils.cpp +++ b/core/coreutils.cpp @@ -64,8 +64,8 @@ QString CoreUtils::appInfo() QString CoreUtils::appVersion() { QString version; -#ifdef INPUT_VERSION - version = STR( INPUT_VERSION ); +#ifdef MM_VERSION + version = STR( MM_VERSION ); #endif return version; } @@ -73,8 +73,8 @@ QString CoreUtils::appVersion() QString CoreUtils::appVersionCode() { QString version; -#ifdef INPUT_VERSION_CODE - version = STR( INPUT_VERSION_CODE ); +#ifdef MM_VERSION_CODE + version = STR( MM_VERSION_CODE ); #endif return version; } diff --git a/core/projectchecksumcache.h b/core/projectchecksumcache.h index ba69b88d0..2a151fc45 100644 --- a/core/projectchecksumcache.h +++ b/core/projectchecksumcache.h @@ -17,7 +17,7 @@ #include "inputconfig.h" -#if defined(INPUT_TEST) +#if defined(MM_TEST) class TestProjectChecksumCache; #endif @@ -40,7 +40,7 @@ class ProjectChecksumCache //! Name of the file in which the cache for the project is stored static const QString sCacheFile; -#if defined(INPUT_TEST) +#if defined(MM_TEST) friend class TestProjectChecksumCache; #endif From 35f14e2e7e4009e2125e030b7d1cc43426f5773a Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Fri, 12 Sep 2025 11:30:32 +0200 Subject: [PATCH 02/10] Remove leftovers --- CMakeLists.txt | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cb093533..2ec058c3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,9 +61,6 @@ endif () # ######################################################################################## set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) -# TODO remove this variable -set(INPUT_CMAKE_TEMPLATES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates) - include(VersionDetect) include(PlatformDetect) mm_detect_platform() @@ -379,28 +376,6 @@ if (ANDROID) # set(ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_BINARY_DIR}/android-template) endif () -if (ANDROID) - if (VCPKG_TARGET_TRIPLET STREQUAL "arm-android") - set(CMAKE_C_FLAGS - "${CMAKE_C_FLAGS} -fPIC -fstack-protector-strong -lunwind -Wl,--exclude-libs=libunwind.a" - ) - set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -fPIC -fstack-protector-strong -lunwind -Wl,--exclude-libs=libunwind.a" - ) - else () - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -fstack-protector-strong") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fstack-protector-strong") - endif () - - link_libraries("-ljnigraphics") - - # Make sure the generator for android_deployment_settings.json can figure out the - # architecture - list(APPEND CMAKE_FIND_ROOT_PATH /) - - # set(ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_BINARY_DIR}/android-template) -endif () - # ######################################################################################## # RESOURCES # ######################################################################################## @@ -418,25 +393,6 @@ file( PATTERN "*.cmake" EXCLUDE PATTERN "vcpkg*" EXCLUDE ) - -# ######################################################################################## -# RESOURCES -# ######################################################################################## -message(STATUS "Copying proj and qgis resources to android/assets/qgis-data") -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources) -file(COPY ${QGIS_RESOURCE_DIR}/qgis.db - DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources/ -) -file(COPY ${QGIS_RESOURCE_DIR}/srs.db - DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources/ -) -file( - COPY ${PROJ_DIR} - DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/ - PATTERN "*.cmake" EXCLUDE - PATTERN "vcpkg*" EXCLUDE -) - # ######################################################################################## # SUBDIRECTORIES # ######################################################################################## From 08b05766cfe9cdc7bd459c968f6e699a13efcd24 Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Fri, 12 Sep 2025 11:30:32 +0200 Subject: [PATCH 03/10] Change cmake target to MerginMaps --- .github/workflows/ios.yml | 12 +++---- .github/workflows/linux.yml | 6 ++-- .github/workflows/macos.yml | 2 +- .github/workflows/win.yml | 2 +- CMakeLists.txt | 4 +-- app/CMakeLists.txt | 68 ++++++++++++++++++------------------- cmake/InstallStep.cmake | 18 +++++----- scripts/MM_win.nsi | 4 +-- scripts/create_dmg.sh | 4 +-- 9 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index c147d04bf..2ad610f45 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -178,11 +178,11 @@ jobs: cd build-mm xcodebuild \ - -project Input.xcodeproj/ \ - -scheme Input \ + -project MerginMaps.xcodeproj/ \ + -scheme MerginMaps \ -sdk iphoneos \ -configuration Release \ - archive -archivePath Input.xcarchive \ + archive -archivePath MerginMaps.xcarchive \ "OTHER_CODE_SIGN_FLAGS=--keychain '$KEYCHAIN'" - name: Create package @@ -190,7 +190,7 @@ jobs: INPUT_DIR=`pwd`/mm cd build-mm xcodebuild \ - -archivePath Input.xcarchive \ + -archivePath MerginMaps.xcarchive \ -exportOptionsPlist $INPUT_DIR/scripts/ci/ios/exportOptions.plist \ -exportPath $PWD \ -allowProvisioningUpdates \ @@ -203,6 +203,6 @@ jobs: INPUTAPP_BOT_GITHUB_TOKEN: ${{ secrets.INPUTAPP_BOT_GITHUB_TOKEN }} if: success() run: | - CF_BUNDLE_VERSION=`/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" build-mm/app/CMakeFiles/Input.dir/Info.plist` + CF_BUNDLE_VERSION=`/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" build-mm/app/CMakeFiles/MerginMaps.dir/Info.plist` echo "Publishing ios ${CF_BUNDLE_VERSION}" - xcrun altool --upload-app -t ios -f build-mm/Input.ipa -u "$INPUTAPP_BOT_APPLEID_USER" -p "$INPUTAPP_BOT_APPLEID_PASS" --verbose + xcrun altool --upload-app -t ios -f build-mm/MerginMaps.ipa -u "$INPUTAPP_BOT_APPLEID_USER" -p "$INPUTAPP_BOT_APPLEID_PASS" --verbose diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f9af3ddc8..7679bc02a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -159,7 +159,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: build-mm-db/coverage.info - - name: build Input + - name: build app run: | mkdir -p install-mm mkdir -p build-mm @@ -186,9 +186,9 @@ jobs: with: format: 'YYYYMMDD' - - name: package Input + - name: package app run: | - MM_TAR=input-${{ env.INPUT_SDK_VERSION }}-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.tar.gz + MM_TAR=input-${{ env.MM_VERSION_CODE }}-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.tar.gz echo "MM_TAR=${MM_TAR}" >> $GITHUB_ENV cd ${{ github.workspace }}/install-mm diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 059c58cd9..404f36014 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -180,7 +180,7 @@ jobs: export API_KEY_PATH=authkey.p8 fi - export APP_PATH=${{ github.workspace }}/install-mm/Input.app + export APP_PATH=${{ github.workspace }}/install-mm/MerginMaps.app export DMG_PATH=merginmaps-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.dmg ./mm/scripts/create_dmg.sh diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 2ce118f6b..488580f6f 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -151,7 +151,7 @@ jobs: cmake --build ${{ github.workspace }}\build-mm --config Release --verbose - IF NOT EXIST Release\Input.exe (echo err_INPUT_BUILD & exit /b 1) + IF NOT EXIST Release\MerginMaps.exe (echo err_MERGINMAPS_BUILD & exit /b 1) - name: Install app shell: cmd diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ec058c3b..4092024d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ if (ANDROID_ABI) set(ANDROID_STL "c++_shared") set(ANDROID_ARM_NEON ON) - # Target/Minimum API levels for Android, used as Input target properties + # Target/Minimum API levels for Android, used as MerginMaps target properties set(MM_ANDROID_TARGET_SDK_VERSION "35") set(MM_ANDROID_MIN_SDK_VERSION "${ANDROIDAPI}") set(MM_ANDROID_NDK_PATH "$ENV{ANDROID_NDK_HOME}") @@ -66,7 +66,7 @@ include(PlatformDetect) mm_detect_platform() project( - Input + MerginMaps VERSION ${MM_VERSION_MAJOR}.${MM_VERSION_MINOR}.${MM_VERSION_PATCH} DESCRIPTION "Collect. Share. Publish." HOMEPAGE_URL "https://merginmaps.com" diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 5c1efb99f..8853b4570 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -300,16 +300,16 @@ qt_add_resources( # ######################################################################################## qt_add_executable( - Input + MerginMaps ${MM_SRCS} ${MM_HDRS} main.cpp ) -set_target_properties(Input PROPERTIES WIN32_EXECUTABLE TRUE) +set_target_properties(MerginMaps PROPERTIES WIN32_EXECUTABLE TRUE) target_include_directories( - Input + MerginMaps PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/attributes ${CMAKE_CURRENT_SOURCE_DIR}/map @@ -338,7 +338,7 @@ if (ANDROID) ) set_target_properties( - Input + MerginMaps PROPERTIES QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android QT_ANDROID_TARGET_SDK_VERSION ${MM_ANDROID_TARGET_SDK_VERSION} QT_ANDROID_MIN_SDK_VERSION ${MM_ANDROID_MIN_SDK_VERSION} @@ -349,7 +349,7 @@ endif () if (MACOS) set_target_properties( - Input + MerginMaps PROPERTIES MACOSX_BUNDLE TRUE MACOSX_RPATH TRUE MACOSX_BUNDLE_GUI_IDENTIFIER LutraConsultingLtd.Input @@ -363,28 +363,28 @@ endif () if (IOS) # qgis resources set(IOS_CRS_DIR ${CMAKE_CURRENT_BINARY_DIR}/android/assets/qgis-data/resources) - target_sources(Input PRIVATE ${IOS_CRS_DIR}) + target_sources(MerginMaps PRIVATE ${IOS_CRS_DIR}) set_source_files_properties( ${IOS_CRS_DIR} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/qgis-data ) # proj set(IOS_PROJ_DIR ${CMAKE_CURRENT_BINARY_DIR}/android/assets/qgis-data/proj) - target_sources(Input PRIVATE ${IOS_PROJ_DIR}) + target_sources(MerginMaps PRIVATE ${IOS_PROJ_DIR}) set_source_files_properties( ${IOS_PROJ_DIR} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/qgis-data ) # app icon set(IOS_ASSET_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ios/Images.xcassets) - target_sources(Input PRIVATE ${IOS_ASSET_DIR}) + target_sources(MerginMaps PRIVATE ${IOS_ASSET_DIR}) set_source_files_properties( ${IOS_ASSET_DIR} PROPERTIES MACOSX_PACKAGE_LOCATION Resources ) # launch screen set_target_properties( - Input + MerginMaps PROPERTIES QT_IOS_LAUNCH_SCREEN ${CMAKE_CURRENT_SOURCE_DIR}/ios/launchscreen/MMLaunchScreen.storyboard ) @@ -395,7 +395,7 @@ if (IOS) ${ENTITLEMENTS_FILE} ${CMAKE_CURRENT_BINARY_DIR}/mm.entitlements COPYONLY ) set(ENTITLEMENTS_FILE_IN_BUILD ${CMAKE_CURRENT_BINARY_DIR}/mm.entitlements) - target_sources(Input PRIVATE ${ENTITLEMENTS_FILE}) + target_sources(MerginMaps PRIVATE ${ENTITLEMENTS_FILE}) set_source_files_properties( ${ENTITLEMENTS_FILE} PROPERTIES XCODE_LAST_KNOWN_FILE_TYPE "text.plist.entitlements" ) @@ -403,7 +403,7 @@ if (IOS) message(STATUS "iOS signing entitlements file: ${ENTITLEMENTS_FILE_IN_BUILD}") set_target_properties( - Input + MerginMaps PROPERTIES MACOSX_BUNDLE TRUE MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake_templates/iOSInfo.plist.in MACOSX_BUNDLE_GUI_IDENTIFIER "LutraConsultingLtd.Input" @@ -418,7 +418,7 @@ if (IOS) # use production signing profile set_target_properties( - Input + MerginMaps PROPERTIES XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "LutraConsultingLtd.Input.AppStore" XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY @@ -430,7 +430,7 @@ if (IOS) else () # use development profiles - automatically manage signing - set_target_properties(Input PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic") + set_target_properties(MerginMaps PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic") message(STATUS "Using automatic code sign") endif () endif () @@ -439,16 +439,16 @@ endif () # LINKING Mergin Maps Target # ######################################################################################## -target_link_libraries(Input PUBLIC mm_core) +target_link_libraries(MerginMaps PUBLIC mm_core) # at least on Linux qgis_core needs to be linked before Qt libs, otherwise one gets "DSO # missing from command line" linker error about missing symbol from qt6::core5compat # library - probably if our code does not use anything from that library, it is not added # (linking order matters) -target_link_libraries(Input PUBLIC QGIS::Core) +target_link_libraries(MerginMaps PUBLIC QGIS::Core) target_link_libraries( - Input + MerginMaps PUBLIC Qt6::Quick Qt6::Qml Qt6::Xml @@ -465,20 +465,20 @@ target_link_libraries( ) if (HAVE_BLUETOOTH) - target_link_libraries(Input PUBLIC Qt6::Bluetooth) + target_link_libraries(MerginMaps PUBLIC Qt6::Bluetooth) endif () -target_link_libraries(Input PUBLIC Qt6::Multimedia Qt6::Widgets) +target_link_libraries(MerginMaps PUBLIC Qt6::Multimedia Qt6::Widgets) if (NOT IOS) - target_link_libraries(Input PUBLIC Qt6::PrintSupport) + target_link_libraries(MerginMaps PUBLIC Qt6::PrintSupport) endif () if (ANDROID) - target_link_libraries(Input PUBLIC Qt6::CorePrivate) + target_link_libraries(MerginMaps PUBLIC Qt6::CorePrivate) endif () target_link_libraries( - Input + MerginMaps PUBLIC Geodiff::Geodiff PROJ::proj ZXing::Core @@ -486,7 +486,7 @@ target_link_libraries( ) target_link_libraries( - Input + MerginMaps PUBLIC QGIS::authmethod_basic QGIS::authmethod_esritoken QGIS::authmethod_identcert @@ -507,11 +507,11 @@ target_link_libraries( if (LNX) # needs to be added again because of the cycling dependencies between qgis_core and # providers and auth methods - target_link_libraries(Input PUBLIC QGIS::Core) + target_link_libraries(MerginMaps PUBLIC QGIS::Core) endif () target_link_libraries( - Input + MerginMaps PUBLIC Qt6Keychain::Qt6Keychain qca GDAL::GDAL @@ -524,7 +524,7 @@ target_link_libraries( # target_link_libraries(Input PUBLIC Xml2::Xml2) target_link_libraries( - Input + MerginMaps PUBLIC Spatialindex::Spatialindex GEOS::geos_c # Geos::Geos @@ -543,34 +543,34 @@ target_link_libraries( ) if (IOS OR MACOS) - target_link_libraries(Input PUBLIC Tasn1::Tasn1) + target_link_libraries(MerginMaps PUBLIC Tasn1::Tasn1) endif () # target_link_libraries(Input PUBLIC OpenSSL::OpenSSL OpenSSL::Crypto) if (ANDROID) set_property( - TARGET Input PROPERTY QT_ANDROID_EXTRA_LIBS ${KDAB_OpenSSL_CRYPTO_LIBRARY} + TARGET MerginMaps PROPERTY QT_ANDROID_EXTRA_LIBS ${KDAB_OpenSSL_CRYPTO_LIBRARY} ${KDAB_OpenSSL_LIBRARY} ) endif () if (MACOS OR IOS) target_link_libraries( - Input PUBLIC AppleFrameworks::Security AppleFrameworks::CoreFoundation + MerginMaps PUBLIC AppleFrameworks::Security AppleFrameworks::CoreFoundation AppleFrameworks::SystemConfiguration ) endif () if (IOS) target_link_libraries( - Input PUBLIC AppleFrameworks::CoreLocation AppleFrameworks::CoreHaptics + MerginMaps PUBLIC AppleFrameworks::CoreLocation AppleFrameworks::CoreHaptics ) # TODO is this needed? qt_add_ios_ffmpeg_libraries(Input) # Qt Multimedia endif () if (WIN) target_link_libraries( - Input + MerginMaps PUBLIC WinLibraries::avcodec WinLibraries::avdevice WinLibraries::avformat @@ -580,11 +580,11 @@ if (WIN) WinLibraries::openh264 ) - target_link_libraries(Input PUBLIC expat::expat) + target_link_libraries(MerginMaps PUBLIC expat::expat) endif () if (ENABLE_TESTS) - target_link_libraries(Input PUBLIC Qt6::Test) + target_link_libraries(MerginMaps PUBLIC Qt6::Test) endif () # ######################################################################################## @@ -592,7 +592,7 @@ endif () # ######################################################################################## target_compile_definitions( - Input PRIVATE $<$,$>:QT_QML_DEBUG> + MerginMaps PRIVATE $<$,$>:QT_QML_DEBUG> ) add_subdirectory(qml) @@ -608,7 +608,7 @@ endforeach () # For some reason, this call cannot be in qml/CMakeLists.txt qt_add_qml_module( - Input + MerginMaps URI MMInput VERSION 1.0 QML_FILES ${MM_QML_SRCS} diff --git a/cmake/InstallStep.cmake b/cmake/InstallStep.cmake index b652ebd05..b25df2627 100644 --- a/cmake/InstallStep.cmake +++ b/cmake/InstallStep.cmake @@ -11,10 +11,10 @@ set(Qt6_base_dir ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/Qt6) # ######################################################################################## if (WIN) - install(TARGETS Input RUNTIME DESTINATION .) + install(TARGETS MerginMaps RUNTIME DESTINATION .) else () install( - TARGETS Input + TARGETS MerginMaps LIBRARY DESTINATION lib64/ BUNDLE DESTINATION . ) @@ -26,18 +26,18 @@ endif () if (MACOS) get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if (isMultiConfig) - set(deploy_script "${CMAKE_CURRENT_BINARY_DIR}/deploy_input_$.cmake") + set(deploy_script "${CMAKE_CURRENT_BINARY_DIR}/deploy_merginmaps_$.cmake") else () set(deploy_script - "${CMAKE_CURRENT_BINARY_DIR}/deploy_input_${CMAKE_BUILD_TYPE}.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/deploy_merginmaps_${CMAKE_BUILD_TYPE}.cmake" ) endif () - set(executable_path "Input.app/Contents/MacOS/INPUT") + set(executable_path "MerginMaps.app/Contents/MacOS/MerginMaps") qt_generate_deploy_script( TARGET - Input + MerginMaps OUTPUT_SCRIPT deploy_script CONTENT @@ -54,7 +54,7 @@ if (MACOS) elseif (WIN) qt_generate_deploy_qml_app_script( TARGET - Input + MerginMaps OUTPUT_SCRIPT deploy_script NO_TRANSLATIONS @@ -218,7 +218,7 @@ if (WIN) elseif (LNX) set(translations_dir "share/translations") elseif (MACOS) - set(translations_dir "Input.app/Contents/Resources/i18n") + set(translations_dir "MerginMaps.app/Contents/Resources/i18n") endif () install( @@ -236,7 +236,7 @@ if (WIN) elseif (LNX) set(assets_dir "share/input") elseif (MACOS) - set(assets_dir "Input.app/Contents/Resources/INPUT") + set(assets_dir "MerginMaps.app/Contents/Resources/MerginMaps") endif () install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/app/android/assets/qgis-data diff --git a/scripts/MM_win.nsi b/scripts/MM_win.nsi index d33147f56..4c4ea19a7 100644 --- a/scripts/MM_win.nsi +++ b/scripts/MM_win.nsi @@ -51,7 +51,7 @@ section "install" # Start Menu createDirectory "$SMPROGRAMS\${COMPANYNAME}" - createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\Input.exe" "" "$INSTDIR\images\AppIcon.ico" + createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\MerginMaps.exe" "" "$INSTDIR\images\AppIcon.ico" # Registry information for add/remove programs WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" "${COMPANYNAME} - ${APPNAME} - ${DESCRIPTION}" @@ -73,7 +73,7 @@ function un.onInit SetShellVarContext all #Verify the uninstaller - last chance to back out - MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" IDOK next + MessageBox MB_OKCANCEL "Permanently remove ${APPNAME}?" IDOK next Abort next: !insertmacro VerifyUserIsAdmin diff --git a/scripts/create_dmg.sh b/scripts/create_dmg.sh index 0c54a2a41..83681fd9e 100755 --- a/scripts/create_dmg.sh +++ b/scripts/create_dmg.sh @@ -25,11 +25,11 @@ if [[ -n ${API_KEY_ID:-} ]]; then fi create-dmg --volname "Mergin Maps Mobile App Installer" \ - --hide-extension "Input.app" \ + --hide-extension "MerginMaps.app" \ --window-pos 200 120 \ --window-size 512 320 \ --icon-size 100 \ - --icon "Input.app" 130 160 \ + --icon "MerginMaps.app" 130 160 \ --app-drop-link 400 155 \ "$DMG_PATH" "$APP_PATH" From e2682b47ae2c7f9def3019969949c2a6e849b288 Mon Sep 17 00:00:00 2001 From: Withalion Date: Fri, 26 Sep 2025 22:08:53 +0200 Subject: [PATCH 04/10] Change inputconfig.h to mmconfig.h --- CMakeLists.txt | 7 ++++--- app/activelayer.h | 1 - app/activeproject.h | 1 - app/attributes/attributecontroller.h | 1 - app/attributes/attributedata.h | 1 - app/attributes/attributeformmodel.h | 3 --- app/attributes/attributeformproxymodel.h | 2 -- app/attributes/attributetabmodel.h | 2 -- app/attributes/attributetabproxymodel.h | 2 -- app/attributes/fieldvalidator.h | 2 -- app/attributes/rememberattributescontroller.h | 2 +- app/autosynccontroller.h | 1 - app/bluetoothdiscoverymodel.h | 2 +- app/compass.h | 2 -- app/featurelayerpair.h | 2 -- app/fieldsmodel.h | 2 -- app/guidelinecontroller.h | 2 -- app/identifykit.h | 2 -- app/imageutils.h | 2 -- app/inputexpressionfunctions.h | 1 - app/inputprojutils.h | 2 -- app/inpututils.h | 1 - app/ios/iosimagepicker.h | 2 -- app/ios/iosinterface.h | 1 - app/ios/iosutils.h | 1 - app/layer/layerdetaildata.h | 2 -- app/layer/layertreeflatmodel.h | 2 -- app/layer/layertreeflatmodelpixmapprovider.h | 2 -- app/layer/layertreeflatsortfiltermodel.h | 1 - app/layer/layertreemodel.h | 1 - app/layer/layertreemodelpixmapprovider.h | 1 - app/layer/layertreesortfiltermodel.h | 1 - app/layersmodel.h | 1 - app/main.cpp | 2 +- app/map/inputcoordinatetransformer.h | 2 -- app/map/inputmapcanvasmap.h | 2 -- app/map/inputmapsettings.h | 2 -- app/map/inputmaptransform.h | 2 -- app/mapthemesmodel.h | 1 - app/maptools/abstractmaptool.h | 1 - app/maptools/recordingmaptool.h | 2 -- app/maptools/splittingmaptool.h | 1 - app/position/mapposition.h | 1 - app/position/positiondirection.h | 1 - app/position/positionkit.h | 2 -- app/position/providers/abstractpositionprovider.h | 1 - app/position/providers/androidpositionprovider.h | 1 - app/position/providers/bluetoothpositionprovider.h | 1 - app/position/providers/internalpositionprovider.h | 1 - app/position/providers/positionprovidersmodel.h | 1 - app/position/providers/simulatedpositionprovider.h | 1 - app/projectsmodel.h | 1 - app/projectsproxymodel.h | 1 - app/projectwizard.h | 1 - app/qrcodedecoder.h | 2 -- app/recordinglayersproxymodel.h | 1 - app/relationfeaturesmodel.h | 1 - app/relationreferencefeaturesmodel.h | 1 - app/snaputils.h | 1 - app/synchronizationerror.h | 2 -- app/synchronizationmanager.h | 1 - app/synchronizationoptions.h | 2 -- app/test/testattributepreviewcontroller.h | 2 -- app/test/testcoreutils.h | 2 -- app/test/testformeditors.h | 2 -- app/test/testidentifykit.h | 2 -- app/test/testlayertree.h | 1 - app/test/testlinks.h | 1 - app/test/testmaptools.h | 1 - app/test/testmerginapi.h | 1 - app/test/testmodels.h | 2 -- app/test/testposition.h | 6 +++--- app/test/testrememberattributescontroller.h | 2 -- app/test/testscalebarkit.h | 2 -- app/test/testutils.cpp | 1 + app/test/testutils.h | 1 - app/test/testutilsfunctions.h | 1 - app/valuerelationfeaturesmodel.h | 1 - app/variablesmanager.h | 1 - cmake_templates/{inputconfig.h.in => mmconfig.h.in} | 4 ++-- core/coreutils.cpp | 2 +- core/projectchecksumcache.h | 2 +- 82 files changed, 15 insertions(+), 119 deletions(-) rename cmake_templates/{inputconfig.h.in => mmconfig.h.in} (88%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4092024d7..3f759e313 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,14 +300,14 @@ if (IOS) add_compile_definitions(QT_NO_PRINTER) endif () -# This is for QGIS defined, do not move to inputconfig.h +# This is for QGIS defined, do not move to mmconfig.h add_compile_definitions(HAVE_WIDGETS) # QGIS defines # add_compile_definitions("$<$:QGIS_PREFIX_PATH=${QGIS_PREFIX_PATH}>") add_compile_definitions("$<$:QGIS_QUICK_EXPAND_TEST_DATA>") -# Generate inputconfig.h + if (ENABLE_TESTS) set(MM_TEST TRUE) file(COPY test/test_data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test/) @@ -316,8 +316,9 @@ endif () set(MM_FORMATS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/docs/supported_formats.txt") +# Generate mmconfig.h configure_file( - ${CMAKE_SOURCE_DIR}/cmake_templates/inputconfig.h.in ${CMAKE_BINARY_DIR}/inputconfig.h + ${CMAKE_SOURCE_DIR}/cmake_templates/mmconfig.h.in ${CMAKE_BINARY_DIR}/mmconfig.h ) include_directories(${CMAKE_BINARY_DIR}) diff --git a/app/activelayer.h b/app/activelayer.h index 40047932b..9c7cbf658 100644 --- a/app/activelayer.h +++ b/app/activelayer.h @@ -13,7 +13,6 @@ #include -#include "inputconfig.h" #include "qgsmaplayer.h" #include "qgsvectorlayer.h" diff --git a/app/activeproject.h b/app/activeproject.h index e4c3cc843..ead92dd23 100644 --- a/app/activeproject.h +++ b/app/activeproject.h @@ -15,7 +15,6 @@ #include "qgsproject.h" -#include "inputconfig.h" #include "appsettings.h" #include "activelayer.h" #include "recordinglayersproxymodel.h" diff --git a/app/attributes/attributecontroller.h b/app/attributes/attributecontroller.h index 4927f40cd..9915b3e46 100644 --- a/app/attributes/attributecontroller.h +++ b/app/attributes/attributecontroller.h @@ -24,7 +24,6 @@ #include #include -#include "inputconfig.h" #include "featurelayerpair.h" #include "attributedata.h" #include "attributeformproxymodel.h" diff --git a/app/attributes/attributedata.h b/app/attributes/attributedata.h index d24375429..9a5178be3 100644 --- a/app/attributes/attributedata.h +++ b/app/attributes/attributedata.h @@ -25,7 +25,6 @@ #include #include -#include "inputconfig.h" #include "qgsfieldconstraints.h" #include "qgseditorwidgetsetup.h" #include "qgsexpression.h" diff --git a/app/attributes/attributeformmodel.h b/app/attributes/attributeformmodel.h index 6e410ff39..07c799591 100644 --- a/app/attributes/attributeformmodel.h +++ b/app/attributes/attributeformmodel.h @@ -20,9 +20,6 @@ #include #include -#include "inputconfig.h" - - class AttributeController; /** diff --git a/app/attributes/attributeformproxymodel.h b/app/attributes/attributeformproxymodel.h index 967b5e39f..e6fee7c5c 100644 --- a/app/attributes/attributeformproxymodel.h +++ b/app/attributes/attributeformproxymodel.h @@ -18,8 +18,6 @@ #include -#include "inputconfig.h" - class AttributeFormModel; /** diff --git a/app/attributes/attributetabmodel.h b/app/attributes/attributetabmodel.h index 0c15ecfeb..bfe220125 100644 --- a/app/attributes/attributetabmodel.h +++ b/app/attributes/attributetabmodel.h @@ -20,8 +20,6 @@ #include #include -#include "inputconfig.h" - class AttributeController; class AttributeFormProxyModel; diff --git a/app/attributes/attributetabproxymodel.h b/app/attributes/attributetabproxymodel.h index a8d5a34e2..aef63ef77 100644 --- a/app/attributes/attributetabproxymodel.h +++ b/app/attributes/attributetabproxymodel.h @@ -18,8 +18,6 @@ #include -#include "inputconfig.h" - class AttributeTabModel; class AttributeFormProxyModel; diff --git a/app/attributes/fieldvalidator.h b/app/attributes/fieldvalidator.h index 776a2df72..3ffba922c 100644 --- a/app/attributes/fieldvalidator.h +++ b/app/attributes/fieldvalidator.h @@ -14,8 +14,6 @@ #include #include -#include "inputconfig.h" - class FormItem; class FeatureLayerPair; diff --git a/app/attributes/rememberattributescontroller.h b/app/attributes/rememberattributescontroller.h index 4740c153a..1c8970412 100644 --- a/app/attributes/rememberattributescontroller.h +++ b/app/attributes/rememberattributescontroller.h @@ -19,7 +19,7 @@ #include "qgsfeature.h" #include "qgsvectorlayer.h" -#include "inputconfig.h" + #include class FeatureLayerPair; diff --git a/app/autosynccontroller.h b/app/autosynccontroller.h index 5259fabf3..bfe4c56ae 100644 --- a/app/autosynccontroller.h +++ b/app/autosynccontroller.h @@ -11,7 +11,6 @@ #define AUTOSYNCCONTROLLER_H #include -#include "inputconfig.h" class QgsProject; diff --git a/app/bluetoothdiscoverymodel.h b/app/bluetoothdiscoverymodel.h index e9ef18eaa..c9b35dd28 100644 --- a/app/bluetoothdiscoverymodel.h +++ b/app/bluetoothdiscoverymodel.h @@ -15,7 +15,7 @@ #include #include -#include "inputconfig.h" +#include "mmconfig.h" #ifdef HAVE_BLUETOOTH #include diff --git a/app/compass.h b/app/compass.h index b2cf7ea20..106412d83 100644 --- a/app/compass.h +++ b/app/compass.h @@ -15,8 +15,6 @@ #include #include -#include "inputconfig.h" - class Compass: public QObject { Q_OBJECT diff --git a/app/featurelayerpair.h b/app/featurelayerpair.h index 7be08324f..871fc7076 100644 --- a/app/featurelayerpair.h +++ b/app/featurelayerpair.h @@ -21,8 +21,6 @@ #include "qgsfeature.h" #include "qgsvectorlayer.h" -#include "inputconfig.h" - /** * \ingroup quick * \brief Pair of QgsFeature and QgsVectorLayer diff --git a/app/fieldsmodel.h b/app/fieldsmodel.h index 89d76a67b..f33ee6135 100644 --- a/app/fieldsmodel.h +++ b/app/fieldsmodel.h @@ -18,8 +18,6 @@ #include "qgsfield.h" #include "qgsfields.h" -#include "inputconfig.h" - struct FieldConfiguration { QString attributeName; diff --git a/app/guidelinecontroller.h b/app/guidelinecontroller.h index bc1d1a67b..76166fcc6 100644 --- a/app/guidelinecontroller.h +++ b/app/guidelinecontroller.h @@ -13,8 +13,6 @@ #include #include -#include "inputconfig.h" - #include "qgsgeometry.h" #include "inputmapsettings.h" diff --git a/app/identifykit.h b/app/identifykit.h index 610b7c5b4..456b9ff08 100644 --- a/app/identifykit.h +++ b/app/identifykit.h @@ -19,8 +19,6 @@ #include #include -#include "inputconfig.h" - #include "qgsfeature.h" #include "qgsmapsettings.h" #include "qgspoint.h" diff --git a/app/imageutils.h b/app/imageutils.h index ecbe4fc2a..c4cef85ff 100644 --- a/app/imageutils.h +++ b/app/imageutils.h @@ -12,8 +12,6 @@ #include -#include "inputconfig.h" - class ImageUtils { public: diff --git a/app/inputexpressionfunctions.h b/app/inputexpressionfunctions.h index bc8c15ee8..d548e60d1 100644 --- a/app/inputexpressionfunctions.h +++ b/app/inputexpressionfunctions.h @@ -16,7 +16,6 @@ #include "qgsexpression.h" #include "qgsexpressionfunction.h" -#include "inputconfig.h" #include "androidutils.h" #include "inpututils.h" #include "ios/iosimagepicker.h" diff --git a/app/inputprojutils.h b/app/inputprojutils.h index e78c7bdbd..1eb777ca0 100644 --- a/app/inputprojutils.h +++ b/app/inputprojutils.h @@ -13,8 +13,6 @@ #include #include -#include "inputconfig.h" - /** * QGIS uses PROJ library for doing CRS transformations. * We currently ship the basic PROJ resources QGIS needs to do most common projections by adding them to the assets in APKs (see https://github.com/MerginMaps/mobile/tree/master/app/android/assets/qgis-data). There could be a custom PROJ datum shifts used by users as part of their mergin projects in the `/proj/` folder. diff --git a/app/inpututils.h b/app/inpututils.h index 56b4907f5..545b358d0 100644 --- a/app/inpututils.h +++ b/app/inpututils.h @@ -24,7 +24,6 @@ #include -#include "inputconfig.h" #include "inputhelp.h" #include "merginapi.h" #include "androidutils.h" diff --git a/app/ios/iosimagepicker.h b/app/ios/iosimagepicker.h index c902f318b..7b3414fa5 100644 --- a/app/ios/iosimagepicker.h +++ b/app/ios/iosimagepicker.h @@ -19,8 +19,6 @@ #include #include -#include "inputconfig.h" - class PositionKit; class Compass; diff --git a/app/ios/iosinterface.h b/app/ios/iosinterface.h index 685601711..fe73251ea 100644 --- a/app/ios/iosinterface.h +++ b/app/ios/iosinterface.h @@ -20,7 +20,6 @@ #include -#include "inputconfig.h" #include "iosimagepicker.h" /** diff --git a/app/ios/iosutils.h b/app/ios/iosutils.h index 76bb66cca..9bcb0b474 100644 --- a/app/ios/iosutils.h +++ b/app/ios/iosutils.h @@ -18,7 +18,6 @@ #include -#include "inputconfig.h" #include "iosimagepicker.h" #include "position/positionkit.h" #include "compass.h" diff --git a/app/layer/layerdetaildata.h b/app/layer/layerdetaildata.h index 185ab8c23..2b878c1de 100644 --- a/app/layer/layerdetaildata.h +++ b/app/layer/layerdetaildata.h @@ -13,8 +13,6 @@ #include #include -#include "inputconfig.h" - #include "qgslayertreenode.h" #include "qgslegendrenderer.h" #include "qgsvectorlayer.h" diff --git a/app/layer/layertreeflatmodel.h b/app/layer/layertreeflatmodel.h index 690dce38a..7e61e99ed 100644 --- a/app/layer/layertreeflatmodel.h +++ b/app/layer/layertreeflatmodel.h @@ -14,8 +14,6 @@ #include #include -#include "inputconfig.h" - #include "qgsproject.h" #include "layer/layertreemodel.h" diff --git a/app/layer/layertreeflatmodelpixmapprovider.h b/app/layer/layertreeflatmodelpixmapprovider.h index 68208d64c..651a6b7e4 100644 --- a/app/layer/layertreeflatmodelpixmapprovider.h +++ b/app/layer/layertreeflatmodelpixmapprovider.h @@ -10,8 +10,6 @@ #ifndef LAYERTREEFLATMODELPIXMAPPROVIDER_H #define LAYERTREEFLATMODELPIXMAPPROVIDER_H -#include "inputconfig.h" - #include "layer/layertreeflatmodel.h" #include diff --git a/app/layer/layertreeflatsortfiltermodel.h b/app/layer/layertreeflatsortfiltermodel.h index b886f42ba..fd2e09870 100644 --- a/app/layer/layertreeflatsortfiltermodel.h +++ b/app/layer/layertreeflatsortfiltermodel.h @@ -14,7 +14,6 @@ #include #include -#include "inputconfig.h" #include "layer/layertreeflatmodel.h" class LayerTreeFlatSortFilterModel : public QSortFilterProxyModel diff --git a/app/layer/layertreemodel.h b/app/layer/layertreemodel.h index 58542b564..15b3b5b3f 100644 --- a/app/layer/layertreemodel.h +++ b/app/layer/layertreemodel.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "qgslayertreemodel.h" #include "qgsproject.h" diff --git a/app/layer/layertreemodelpixmapprovider.h b/app/layer/layertreemodelpixmapprovider.h index 9ead53881..723c1e06b 100644 --- a/app/layer/layertreemodelpixmapprovider.h +++ b/app/layer/layertreemodelpixmapprovider.h @@ -14,7 +14,6 @@ #include #include -#include "inputconfig.h" #include "layer/layertreemodel.h" class LayerTreeModelPixmapProvider : public QQuickImageProvider diff --git a/app/layer/layertreesortfiltermodel.h b/app/layer/layertreesortfiltermodel.h index 67bb9b998..205c7f7e5 100644 --- a/app/layer/layertreesortfiltermodel.h +++ b/app/layer/layertreesortfiltermodel.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "qgslayertreenode.h" #include "layer/layertreemodel.h" diff --git a/app/layersmodel.h b/app/layersmodel.h index 7613d51af..99bc7ee3f 100644 --- a/app/layersmodel.h +++ b/app/layersmodel.h @@ -14,7 +14,6 @@ #include #include -#include "inputconfig.h" #include "inpututils.h" #include "qgsmaplayer.h" #include "qgsmaplayermodel.h" diff --git a/app/main.cpp b/app/main.cpp index fd6fb917a..122809b69 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -7,7 +7,7 @@ * * ***************************************************************************/ -#include "inputconfig.h" +#include "mmconfig.h" #include #include diff --git a/app/map/inputcoordinatetransformer.h b/app/map/inputcoordinatetransformer.h index e34a12e29..4d412e110 100644 --- a/app/map/inputcoordinatetransformer.h +++ b/app/map/inputcoordinatetransformer.h @@ -17,8 +17,6 @@ #include -#include "inputconfig.h" - #include "qgspoint.h" #include "qgscoordinatetransformcontext.h" diff --git a/app/map/inputmapcanvasmap.h b/app/map/inputmapcanvasmap.h index 0e07d6c5d..795157c9b 100644 --- a/app/map/inputmapcanvasmap.h +++ b/app/map/inputmapcanvasmap.h @@ -15,8 +15,6 @@ #ifndef INPUTMAPCANVASMAP_H #define INPUTMAPCANVASMAP_H -#include "inputconfig.h" - #include "inputmapsettings.h" #include diff --git a/app/map/inputmapsettings.h b/app/map/inputmapsettings.h index d3e1680cf..e8fac298e 100644 --- a/app/map/inputmapsettings.h +++ b/app/map/inputmapsettings.h @@ -15,8 +15,6 @@ #ifndef INPUTMAPSETTINGS_H #define INPUTMAPSETTINGS_H -#include "inputconfig.h" - #include #include "qgscoordinatetransformcontext.h" diff --git a/app/map/inputmaptransform.h b/app/map/inputmaptransform.h index bcdd46de1..581e431fc 100644 --- a/app/map/inputmaptransform.h +++ b/app/map/inputmaptransform.h @@ -15,8 +15,6 @@ #ifndef INPUTMAPTRANSFORM_H #define INPUTMAPTRANSFORM_H -#include "inputconfig.h" - #include #include diff --git a/app/mapthemesmodel.h b/app/mapthemesmodel.h index 54bb8d83a..4c716da63 100644 --- a/app/mapthemesmodel.h +++ b/app/mapthemesmodel.h @@ -19,7 +19,6 @@ #include -#include "inputconfig.h" #include "qgsproject.h" class MapThemesModel : public QStandardItemModel diff --git a/app/maptools/abstractmaptool.h b/app/maptools/abstractmaptool.h index e6eba3532..a8d71789a 100644 --- a/app/maptools/abstractmaptool.h +++ b/app/maptools/abstractmaptool.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "inputmapsettings.h" class AbstractMapTool : public QObject diff --git a/app/maptools/recordingmaptool.h b/app/maptools/recordingmaptool.h index 5a160303e..0587fde9c 100644 --- a/app/maptools/recordingmaptool.h +++ b/app/maptools/recordingmaptool.h @@ -10,8 +10,6 @@ #ifndef RECORDINGMAPTOOL_H #define RECORDINGMAPTOOL_H -#include "inputconfig.h" - #include "abstractmaptool.h" #include diff --git a/app/maptools/splittingmaptool.h b/app/maptools/splittingmaptool.h index cb8251069..2592356f2 100644 --- a/app/maptools/splittingmaptool.h +++ b/app/maptools/splittingmaptool.h @@ -10,7 +10,6 @@ #ifndef SPLITTINGMAPTOOL_H #define SPLITTINGMAPTOOL_H -#include "inputconfig.h" #include "abstractmaptool.h" #include diff --git a/app/position/mapposition.h b/app/position/mapposition.h index 37d042b04..6d46b0c24 100644 --- a/app/position/mapposition.h +++ b/app/position/mapposition.h @@ -12,7 +12,6 @@ #include #include -#include "inputconfig.h" #include "position/positionkit.h" #include "inputmapsettings.h" diff --git a/app/position/positiondirection.h b/app/position/positiondirection.h index fe3423456..48faa6d78 100644 --- a/app/position/positiondirection.h +++ b/app/position/positiondirection.h @@ -15,7 +15,6 @@ #include #include -#include "inputconfig.h" #include "positionkit.h" #include "compass.h" diff --git a/app/position/positionkit.h b/app/position/positionkit.h index 23810aef4..374ca497a 100644 --- a/app/position/positionkit.h +++ b/app/position/positionkit.h @@ -10,8 +10,6 @@ #ifndef POSITIONKIT_H #define POSITIONKIT_H -#include "inputconfig.h" - #include "position/providers/abstractpositionprovider.h" #include "qgspoint.h" diff --git a/app/position/providers/abstractpositionprovider.h b/app/position/providers/abstractpositionprovider.h index d29a18362..6705057b1 100644 --- a/app/position/providers/abstractpositionprovider.h +++ b/app/position/providers/abstractpositionprovider.h @@ -10,7 +10,6 @@ #ifndef ABSTRACTPOSITIONPROVIDER_H #define ABSTRACTPOSITIONPROVIDER_H -#include "inputconfig.h" #include "qobject.h" #include "position/geoposition.h" diff --git a/app/position/providers/androidpositionprovider.h b/app/position/providers/androidpositionprovider.h index fa1772334..f20faf8b7 100644 --- a/app/position/providers/androidpositionprovider.h +++ b/app/position/providers/androidpositionprovider.h @@ -10,7 +10,6 @@ #ifndef ANDROIDPOSITIONPROVIDER_H #define ANDROIDPOSITIONPROVIDER_H -#include "inputconfig.h" #include "abstractpositionprovider.h" #include diff --git a/app/position/providers/bluetoothpositionprovider.h b/app/position/providers/bluetoothpositionprovider.h index f6e4ad098..b872b1c01 100644 --- a/app/position/providers/bluetoothpositionprovider.h +++ b/app/position/providers/bluetoothpositionprovider.h @@ -10,7 +10,6 @@ #ifndef BLUETOOTHPOSITIONPROVIDER_H #define BLUETOOTHPOSITIONPROVIDER_H -#include "inputconfig.h" #include "abstractpositionprovider.h" #include "qgsnmeaconnection.h" diff --git a/app/position/providers/internalpositionprovider.h b/app/position/providers/internalpositionprovider.h index e83975bdf..b3d1d4fdc 100644 --- a/app/position/providers/internalpositionprovider.h +++ b/app/position/providers/internalpositionprovider.h @@ -10,7 +10,6 @@ #ifndef INTERNALPOSITIONPROVIDER_H #define INTERNALPOSITIONPROVIDER_H -#include "inputconfig.h" #include "abstractpositionprovider.h" #include diff --git a/app/position/providers/positionprovidersmodel.h b/app/position/providers/positionprovidersmodel.h index 15dc3c027..dc24171fe 100644 --- a/app/position/providers/positionprovidersmodel.h +++ b/app/position/providers/positionprovidersmodel.h @@ -14,7 +14,6 @@ #include #include -#include "inputconfig.h" #include "appsettings.h" diff --git a/app/position/providers/simulatedpositionprovider.h b/app/position/providers/simulatedpositionprovider.h index e5071f249..61d947d82 100644 --- a/app/position/providers/simulatedpositionprovider.h +++ b/app/position/providers/simulatedpositionprovider.h @@ -10,7 +10,6 @@ #ifndef SIMULATEDPOSITIONPROVIDER_H #define SIMULATEDPOSITIONPROVIDER_H -#include "inputconfig.h" #include "abstractpositionprovider.h" #include diff --git a/app/projectsmodel.h b/app/projectsmodel.h index 3c7542686..900bec57e 100644 --- a/app/projectsmodel.h +++ b/app/projectsmodel.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "project.h" #include "merginapi.h" #include "synchronizationmanager.h" diff --git a/app/projectsproxymodel.h b/app/projectsproxymodel.h index 5e7c888d5..1d27e7ad8 100644 --- a/app/projectsproxymodel.h +++ b/app/projectsproxymodel.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "projectsmodel.h" /** diff --git a/app/projectwizard.h b/app/projectwizard.h index 6dcc20deb..192f622f2 100644 --- a/app/projectwizard.h +++ b/app/projectwizard.h @@ -12,7 +12,6 @@ #include -#include "inputconfig.h" #include "fieldsmodel.h" #include "qgsfieldmodel.h" #include "qgsvectorlayer.h" diff --git a/app/qrcodedecoder.h b/app/qrcodedecoder.h index 7172015e9..c8b278c1b 100644 --- a/app/qrcodedecoder.h +++ b/app/qrcodedecoder.h @@ -16,8 +16,6 @@ #include #include -#include "inputconfig.h" - /** * Converts frames from videoSink (from QML) to images and decodes QR codes from them * It ignores most of the frames and process only few of them per second. diff --git a/app/recordinglayersproxymodel.h b/app/recordinglayersproxymodel.h index 992aa2e5d..91fc5f5ee 100644 --- a/app/recordinglayersproxymodel.h +++ b/app/recordinglayersproxymodel.h @@ -13,7 +13,6 @@ #include -#include "inputconfig.h" #include "qgsmaplayer.h" #include "qgsmaplayerproxymodel.h" #include "qgsvectorlayer.h" diff --git a/app/relationfeaturesmodel.h b/app/relationfeaturesmodel.h index d1b9717bd..9a463037d 100644 --- a/app/relationfeaturesmodel.h +++ b/app/relationfeaturesmodel.h @@ -10,7 +10,6 @@ #ifndef RELATIONFEATURESMODEL_H #define RELATIONFEATURESMODEL_H -#include "inputconfig.h" #include "layerfeaturesmodel.h" #include "featurelayerpair.h" diff --git a/app/relationreferencefeaturesmodel.h b/app/relationreferencefeaturesmodel.h index 121019f36..7f729c86a 100644 --- a/app/relationreferencefeaturesmodel.h +++ b/app/relationreferencefeaturesmodel.h @@ -12,7 +12,6 @@ #include -#include "inputconfig.h" #include "qgsproject.h" #include "layerfeaturesmodel.h" diff --git a/app/snaputils.h b/app/snaputils.h index 4d28d168a..4a98df5ea 100644 --- a/app/snaputils.h +++ b/app/snaputils.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "qgspoint.h" #include "qgsproject.h" #include "qgscoordinatereferencesystem.h" diff --git a/app/synchronizationerror.h b/app/synchronizationerror.h index 86e41515f..aedbb799c 100644 --- a/app/synchronizationerror.h +++ b/app/synchronizationerror.h @@ -13,8 +13,6 @@ #include #include -#include "inputconfig.h" - class SynchronizationError { Q_GADGET diff --git a/app/synchronizationmanager.h b/app/synchronizationmanager.h index ba3d02448..d9cec7c12 100644 --- a/app/synchronizationmanager.h +++ b/app/synchronizationmanager.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "project.h" #include "merginapi.h" #include "synchronizationerror.h" diff --git a/app/synchronizationoptions.h b/app/synchronizationoptions.h index 721b98a1f..0e4cc4d41 100644 --- a/app/synchronizationoptions.h +++ b/app/synchronizationoptions.h @@ -10,8 +10,6 @@ #ifndef SYNCHRONIZATIONOPTIONS_H #define SYNCHRONIZATIONOPTIONS_H -#include "inputconfig.h" - #include #include diff --git a/app/test/testattributepreviewcontroller.h b/app/test/testattributepreviewcontroller.h index 11641bc82..94eb35b4c 100644 --- a/app/test/testattributepreviewcontroller.h +++ b/app/test/testattributepreviewcontroller.h @@ -13,8 +13,6 @@ #include #include -#include "inputconfig.h" - class TestAttributePreviewController: public QObject { Q_OBJECT diff --git a/app/test/testcoreutils.h b/app/test/testcoreutils.h index 8f4541b78..37f9da449 100644 --- a/app/test/testcoreutils.h +++ b/app/test/testcoreutils.h @@ -12,8 +12,6 @@ #include -#include "inputconfig.h" - class TestCoreUtils : public QObject { Q_OBJECT diff --git a/app/test/testformeditors.h b/app/test/testformeditors.h index c518c59b7..e53bc49e5 100644 --- a/app/test/testformeditors.h +++ b/app/test/testformeditors.h @@ -12,8 +12,6 @@ #include -#include "inputconfig.h" - class TestFormEditors : public QObject { Q_OBJECT diff --git a/app/test/testidentifykit.h b/app/test/testidentifykit.h index a5288d99f..cc4f99edc 100644 --- a/app/test/testidentifykit.h +++ b/app/test/testidentifykit.h @@ -12,8 +12,6 @@ #include #include -#include "inputconfig.h" - class TestIdentifyKit: public QObject { Q_OBJECT diff --git a/app/test/testlayertree.h b/app/test/testlayertree.h index 21df0dcc4..6fbdb5abd 100644 --- a/app/test/testlayertree.h +++ b/app/test/testlayertree.h @@ -12,7 +12,6 @@ #include #include -#include "inputconfig.h" class TestLayerTree : public QObject { diff --git a/app/test/testlinks.h b/app/test/testlinks.h index 6da0717ce..02997ad97 100644 --- a/app/test/testlinks.h +++ b/app/test/testlinks.h @@ -14,7 +14,6 @@ #include #include "inputhelp.h" -#include "inputconfig.h" class UrlTester: public QObject { diff --git a/app/test/testmaptools.h b/app/test/testmaptools.h index 69fd832c3..80bed39a4 100644 --- a/app/test/testmaptools.h +++ b/app/test/testmaptools.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "positionkit.h" #include "appsettings.h" diff --git a/app/test/testmerginapi.h b/app/test/testmerginapi.h index 566db9810..44c47fa2c 100644 --- a/app/test/testmerginapi.h +++ b/app/test/testmerginapi.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include #include #include diff --git a/app/test/testmodels.h b/app/test/testmodels.h index 9fb0ab78f..57bbb09f1 100644 --- a/app/test/testmodels.h +++ b/app/test/testmodels.h @@ -10,8 +10,6 @@ #ifndef TESTMODELS_H #define TESTMODELS_H -#include "inputconfig.h" - #include class TestModels : public QObject diff --git a/app/test/testposition.h b/app/test/testposition.h index 735380ddd..a340f0024 100644 --- a/app/test/testposition.h +++ b/app/test/testposition.h @@ -6,13 +6,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include #ifndef TESTPOSITION_H #define TESTPOSITION_H -#include "inputconfig.h" +#include + +#include "mmconfig.h" #include "position/positionkit.h" class TestPosition: public QObject diff --git a/app/test/testrememberattributescontroller.h b/app/test/testrememberattributescontroller.h index 188c43f63..4065fe2cc 100644 --- a/app/test/testrememberattributescontroller.h +++ b/app/test/testrememberattributescontroller.h @@ -12,8 +12,6 @@ #include #include -#include "inputconfig.h" - class TestRememberAttributesController: public QObject { Q_OBJECT diff --git a/app/test/testscalebarkit.h b/app/test/testscalebarkit.h index 20749c664..ad37836c7 100644 --- a/app/test/testscalebarkit.h +++ b/app/test/testscalebarkit.h @@ -12,8 +12,6 @@ #include #include -#include "inputconfig.h" - class TestScaleBarKit: public QObject { Q_OBJECT diff --git a/app/test/testutils.cpp b/app/test/testutils.cpp index 275041176..8b31f9c36 100644 --- a/app/test/testutils.cpp +++ b/app/test/testutils.cpp @@ -13,6 +13,7 @@ #include #include +#include "mmconfig.h" #include "testutils.h" #include "coreutils.h" #include "inpututils.h" diff --git a/app/test/testutils.h b/app/test/testutils.h index 9066faea4..22a735253 100644 --- a/app/test/testutils.h +++ b/app/test/testutils.h @@ -13,7 +13,6 @@ #include #include -#include "inputconfig.h" #include "qgsproject.h" class MerginApi; diff --git a/app/test/testutilsfunctions.h b/app/test/testutilsfunctions.h index aae06ba32..0e0c03ed1 100644 --- a/app/test/testutilsfunctions.h +++ b/app/test/testutilsfunctions.h @@ -11,7 +11,6 @@ #define TESTUTILSFUNCTIONS_H #include -#include "inputconfig.h" #include "inpututils.h" class TestUtilsFunctions: public QObject diff --git a/app/valuerelationfeaturesmodel.h b/app/valuerelationfeaturesmodel.h index aeb9342e1..50e75a3fc 100644 --- a/app/valuerelationfeaturesmodel.h +++ b/app/valuerelationfeaturesmodel.h @@ -10,7 +10,6 @@ #ifndef VALUERELATIONFEATURESMODEL_H #define VALUERELATIONFEATURESMODEL_H -#include "inputconfig.h" #include "layerfeaturesmodel.h" #include "featurelayerpair.h" diff --git a/app/variablesmanager.h b/app/variablesmanager.h index 270ad50af..4bcf8f8d9 100644 --- a/app/variablesmanager.h +++ b/app/variablesmanager.h @@ -12,7 +12,6 @@ #include -#include "inputconfig.h" #include "merginapi.h" #include "qgsproject.h" #include "position/positionkit.h" diff --git a/cmake_templates/inputconfig.h.in b/cmake_templates/mmconfig.h.in similarity index 88% rename from cmake_templates/inputconfig.h.in rename to cmake_templates/mmconfig.h.in index 76f030ce4..772cb9b95 100644 --- a/cmake_templates/inputconfig.h.in +++ b/cmake_templates/mmconfig.h.in @@ -1,5 +1,5 @@ -#ifndef INPUTCONFIG_H -#define INPUTCONFIG_H +#ifndef MMCONFIG_H +#define MMCONFIG_H #define INPUT_APP diff --git a/core/coreutils.cpp b/core/coreutils.cpp index 5ef3026b3..976ebf180 100644 --- a/core/coreutils.cpp +++ b/core/coreutils.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "coreutils.h" -#include "inputconfig.h" +#include "mmconfig.h" #include #include diff --git a/core/projectchecksumcache.h b/core/projectchecksumcache.h index 2a151fc45..0abd3ccf2 100644 --- a/core/projectchecksumcache.h +++ b/core/projectchecksumcache.h @@ -15,7 +15,7 @@ #include #include -#include "inputconfig.h" +#include "mmconfig.h" #if defined(MM_TEST) class TestProjectChecksumCache; From b1b938ea723ff24cb46f652aa075931aba585444 Mon Sep 17 00:00:00 2001 From: Withalion Date: Fri, 26 Sep 2025 22:10:57 +0200 Subject: [PATCH 05/10] Remove INPUT_APP define --- cmake_templates/mmconfig.h.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmake_templates/mmconfig.h.in b/cmake_templates/mmconfig.h.in index 772cb9b95..181bfc603 100644 --- a/cmake_templates/mmconfig.h.in +++ b/cmake_templates/mmconfig.h.in @@ -1,8 +1,6 @@ #ifndef MMCONFIG_H #define MMCONFIG_H -#define INPUT_APP - #cmakedefine VERSTR "@ESCAPED_VERSTR@" #cmakedefine MM_VERSION @MM_VERSION@ #cmakedefine MM_VERSION_CODE @MM_VERSION_CODE@ From b174966b68d887ca5ec3513afb2aca3c79d1ca1f Mon Sep 17 00:00:00 2001 From: Withalion Date: Fri, 26 Sep 2025 22:14:19 +0200 Subject: [PATCH 06/10] Fix cmake formatting --- CMakeLists.txt | 1 - app/CMakeLists.txt | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f759e313..796643306 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,7 +307,6 @@ add_compile_definitions(HAVE_WIDGETS) # add_compile_definitions("$<$:QGIS_PREFIX_PATH=${QGIS_PREFIX_PATH}>") add_compile_definitions("$<$:QGIS_QUICK_EXPAND_TEST_DATA>") - if (ENABLE_TESTS) set(MM_TEST TRUE) file(COPY test/test_data DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test/) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 8853b4570..e057f2baf 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -353,7 +353,8 @@ if (MACOS) PROPERTIES MACOSX_BUNDLE TRUE MACOSX_RPATH TRUE MACOSX_BUNDLE_GUI_IDENTIFIER LutraConsultingLtd.Input - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake_templates/macOsInfo.plist.in + MACOSX_BUNDLE_INFO_PLIST + ${CMAKE_SOURCE_DIR}/cmake_templates/macOsInfo.plist.in MACOSX_BUNDLE_SHORT_VERSION_STRING ${MM_VERSION_CODE} XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@loader_path/Libraries" XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME TRUE @@ -405,7 +406,8 @@ if (IOS) set_target_properties( MerginMaps PROPERTIES MACOSX_BUNDLE TRUE - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake_templates/iOSInfo.plist.in + MACOSX_BUNDLE_INFO_PLIST + ${CMAKE_SOURCE_DIR}/cmake_templates/iOSInfo.plist.in MACOSX_BUNDLE_GUI_IDENTIFIER "LutraConsultingLtd.Input" MACOSX_BUNDLE_SHORT_VERSION_STRING ${MM_VERSION} MACOSX_BUNDLE_BUNDLE_VERSION ${MM_VERSION_CODE} @@ -430,7 +432,9 @@ if (IOS) else () # use development profiles - automatically manage signing - set_target_properties(MerginMaps PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic") + set_target_properties( + MerginMaps PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Automatic" + ) message(STATUS "Using automatic code sign") endif () endif () @@ -550,14 +554,14 @@ endif () if (ANDROID) set_property( TARGET MerginMaps PROPERTY QT_ANDROID_EXTRA_LIBS ${KDAB_OpenSSL_CRYPTO_LIBRARY} - ${KDAB_OpenSSL_LIBRARY} + ${KDAB_OpenSSL_LIBRARY} ) endif () if (MACOS OR IOS) target_link_libraries( MerginMaps PUBLIC AppleFrameworks::Security AppleFrameworks::CoreFoundation - AppleFrameworks::SystemConfiguration + AppleFrameworks::SystemConfiguration ) endif () From 3241f57c371aefa6cc58fb0fd8ac84bee8b0e87e Mon Sep 17 00:00:00 2001 From: Withalion Date: Fri, 26 Sep 2025 22:19:34 +0200 Subject: [PATCH 07/10] Fix tests --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b010ea513..cb703229d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,7 +3,7 @@ # ######################################################################################## macro (add_mm_test testname) - add_test(NAME ${testname} COMMAND Input --${testname}) + add_test(NAME ${testname} COMMAND MerginMaps --${testname}) endmacro () set(MM_TESTS From 8940d165293d83cb0b88376277181f6b4faf75d3 Mon Sep 17 00:00:00 2001 From: Withalion Date: Fri, 26 Sep 2025 23:26:54 +0200 Subject: [PATCH 08/10] Fix android --- .../lutraconsulting/{InputActivity.java => MMActivity.java} | 4 ++-- .../src/uk/co/lutraconsulting/PositionTrackingService.java | 2 +- cmake_templates/AndroidManifest.xml.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename app/android/src/uk/co/lutraconsulting/{InputActivity.java => MMActivity.java} (98%) diff --git a/app/android/src/uk/co/lutraconsulting/InputActivity.java b/app/android/src/uk/co/lutraconsulting/MMActivity.java similarity index 98% rename from app/android/src/uk/co/lutraconsulting/InputActivity.java rename to app/android/src/uk/co/lutraconsulting/MMActivity.java index 0dc8640e3..9a25b7d1e 100644 --- a/app/android/src/uk/co/lutraconsulting/InputActivity.java +++ b/app/android/src/uk/co/lutraconsulting/MMActivity.java @@ -50,9 +50,9 @@ import androidx.core.view.WindowCompat; import androidx.core.splashscreen.SplashScreen; -public class InputActivity extends QtActivity +public class MMActivity extends QtActivity { - private static final String TAG = "Mergin Maps Input Activity"; + private static final String TAG = "Mergin Maps Activity"; private static final int MEDIA_CODE = 101; private boolean keepSplashScreenVisible = true; private String localTargetPath = null; diff --git a/app/android/src/uk/co/lutraconsulting/PositionTrackingService.java b/app/android/src/uk/co/lutraconsulting/PositionTrackingService.java index dc38a3cb8..a20e9f8fb 100644 --- a/app/android/src/uk/co/lutraconsulting/PositionTrackingService.java +++ b/app/android/src/uk/co/lutraconsulting/PositionTrackingService.java @@ -151,7 +151,7 @@ public int onStartCommand( Intent intent, int flags, int startId ) { manager.createNotificationChannel( serviceChannel ); // Build notification for position tracking - Intent notificationIntent = new Intent( this, InputActivity.class ); + Intent notificationIntent = new Intent( this, MMActivity.class ); PendingIntent pendingIntent = PendingIntent.getActivity( this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE ); diff --git a/cmake_templates/AndroidManifest.xml.in b/cmake_templates/AndroidManifest.xml.in index c8f2828c3..147c6025b 100644 --- a/cmake_templates/AndroidManifest.xml.in +++ b/cmake_templates/AndroidManifest.xml.in @@ -42,7 +42,7 @@ android:icon="@mipmap/ic_appicon" android:roundIcon="@mipmap/ic_appicon_round" > From 5a22361c0efd8b134cb62c2a9910146d2af1e5da Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Thu, 2 Oct 2025 15:09:19 +0200 Subject: [PATCH 09/10] Fix naming issues in diagnostic log --- app/inputhelp.cpp | 4 ++-- app/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/inputhelp.cpp b/app/inputhelp.cpp index 514f80874..66602f7e5 100644 --- a/app/inputhelp.cpp +++ b/app/inputhelp.cpp @@ -216,7 +216,7 @@ QString InputHelp::fullLog( const bool isHtml ) const QVector InputHelp::logHeader( const bool isHtml ) const { QVector retLines; - retLines.push_back( QStringLiteral( "Input App: %1 - %2 (%3)" ).arg( CoreUtils::appVersion(), InputUtils::appPlatform(), CoreUtils::appVersionCode() ) ); + retLines.push_back( QStringLiteral( "Mergin Maps App: %1 - %2 (%3)" ).arg( CoreUtils::appVersion(), InputUtils::appPlatform(), CoreUtils::appVersionCode() ) ); retLines.push_back( QStringLiteral( "Device UUID: %1" ).arg( CoreUtils::deviceUuid() ) ); retLines.push_back( QStringLiteral( "Data Dir: %1" ).arg( InputUtils::appDataDir() ) ); retLines.push_back( QStringLiteral( "System: %1" ).arg( QSysInfo::prettyProductName() ) ); @@ -234,7 +234,7 @@ QVector InputHelp::logHeader( const bool isHtml ) const } else { - retLines.push_back( QStringLiteral( "%1Mergin User Profile not available. To include it, open you Profile Page in InputApp%2" ).arg( isHtml ? "" : "", isHtml ? "" : "" ) ); + retLines.push_back( QStringLiteral( "%1Mergin User Profile not available. To include it, open you Profile Page in Mergin Maps%2" ).arg( isHtml ? "" : "", isHtml ? "" : "" ) ); } retLines.push_back( QStringLiteral( "------------------------------------------" ) ); retLines.push_back( QStringLiteral( "Screen Info:" ) ); diff --git a/app/main.cpp b/app/main.cpp index 122809b69..b506a35d1 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -418,7 +418,7 @@ int main( int argc, char *argv[] ) InputTests tests; tests.parseArgs( argc, argv ); #endif - qDebug() << "Mergin Maps Input App" << version << InputUtils::appPlatform() << "(" << CoreUtils::appVersionCode() << ")"; + qDebug() << "Mergin Maps App" << version << InputUtils::appPlatform() << "(" << CoreUtils::appVersionCode() << ")"; qDebug() << "Built with QGIS " << VERSION_INT << " and QT " << qVersion(); qDebug() << "Device uuid " << CoreUtils::deviceUuid(); From 637aeff399f8f5b0f091276179a4afae87ace92d Mon Sep 17 00:00:00 2001 From: Matej Bagar Date: Wed, 8 Oct 2025 14:45:08 +0200 Subject: [PATCH 10/10] Fix failing position tests --- app/position/positionkit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/position/positionkit.cpp b/app/position/positionkit.cpp index 643366d0d..f2b65c224 100644 --- a/app/position/positionkit.cpp +++ b/app/position/positionkit.cpp @@ -9,7 +9,7 @@ #include "position/positionkit.h" #include "coreutils.h" - +#include "mmconfig.h" #include "qgis.h" #ifdef HAVE_BLUETOOTH