Skip to content

Commit

Permalink
remove of purchasing backend
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterPetrik committed Oct 11, 2023
1 parent 6feeb57 commit aa28a4d
Show file tree
Hide file tree
Showing 25 changed files with 16 additions and 2,218 deletions.
25 changes: 1 addition & 24 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,6 @@ else ()
set(HAVE_BLUETOOTH_DEFAULT TRUE)
endif ()

if (IOS)
set(HAVE_PURCHASING_DEFAULT TRUE)
set(HAVE_APPLE_PURCHASING_DEFAULT TRUE)
else ()
set(HAVE_PURCHASING_DEFAULT ${ENABLE_TESTS_DEFAULT})
set(HAVE_APPLE_PURCHASING_DEFAULT FALSE)
endif ()

# on android in multi-ABI build, command line variables are NOT passed to
# ExternalProject_Add called by QT. Therefore we need to pass the variables through ENV
if (ANDROID)
Expand Down Expand Up @@ -150,14 +142,7 @@ set(HAVE_BLUETOOTH
${HAVE_BLUETOOTH_DEFAULT}
CACHE BOOL "Building with bluetooth position provider"
)
set(HAVE_PURCHASING
${HAVE_PURCHASING_DEFAULT}
CACHE BOOL "Build with purchasing (e.g. for test of purchasing GUI)"
)
set(HAVE_APPLE_PURCHASING
${HAVE_APPLE_PURCHASING_DEFAULT}
CACHE BOOL "Building with Apple's StoreKit support"
)

set(QT6_VERSION
${QT_VERSION_DEFAULT}
CACHE STRING "QT6 version to use"
Expand Down Expand Up @@ -343,14 +328,6 @@ if (ENABLE_TESTS)
set(TEST_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/test/test_data")
endif ()

if (HAVE_PURCHASING)
set(PURCHASING TRUE)
endif ()

if (HAVE_APPLE_PURCHASING)
set(APPLE_PURCHASING TRUE)
endif ()

configure_file(
${CMAKE_SOURCE_DIR}/cmake_templates/inputconfig.h.in ${CMAKE_BINARY_DIR}/inputconfig.h
)
Expand Down
18 changes: 0 additions & 18 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ set(MM_SRCS
projectsmodel.cpp
projectsproxymodel.cpp
projectwizard.cpp
purchasing.cpp
qrdecoder.cpp
relationfeaturesmodel.cpp
relationreferencefeaturesmodel.cpp
Expand Down Expand Up @@ -149,7 +148,6 @@ set(MM_HDRS
projectsmodel.h
projectsproxymodel.h
projectwizard.h
purchasing.h
qrdecoder.h
relationfeaturesmodel.h
relationreferencefeaturesmodel.h
Expand Down Expand Up @@ -181,14 +179,12 @@ if (ENABLE_TESTS)
test/testformeditors.cpp
test/testidentifykit.cpp
test/testimageutils.cpp
test/testingpurchasingbackend.cpp
test/testlayertree.cpp
test/testlinks.cpp
test/testmaptools.cpp
test/testmerginapi.cpp
test/testmodels.cpp
test/testposition.cpp
test/testpurchasing.cpp
test/testrememberattributescontroller.cpp
test/testscalebarkit.cpp
test/testutils.cpp
Expand All @@ -207,14 +203,12 @@ if (ENABLE_TESTS)
test/testformeditors.h
test/testidentifykit.h
test/testimageutils.h
test/testingpurchasingbackend.h
test/testlayertree.h
test/testlinks.h
test/testmaptools.h
test/testmerginapi.h
test/testmodels.h
test/testposition.h
test/testpurchasing.h
test/testrememberattributescontroller.h
test/testscalebarkit.h
test/testutils.h
Expand Down Expand Up @@ -246,12 +240,6 @@ if (IOS)
)
endif ()

if (HAVE_APPLE_PURCHASING)
set(MM_HDRS ${MM_HDRS} ios/iospurchasing.h)

set(MM_SRCS ${MM_SRCS} ios/iospurchasing.mm)
endif ()

if (ANDROID)
set(MM_HDRS ${MM_HDRS} position/tracking/androidtrackingbackend.h
position/tracking/androidtrackingbroadcast.h
Expand Down Expand Up @@ -538,12 +526,6 @@ if (IOS)
target_link_libraries(Input PUBLIC AppleFrameworks::CoreLocation)
endif ()

if (HAVE_APPLE_PURCHASING)
target_link_libraries(
Input PUBLIC AppleFrameworks::StoreKit AppleFrameworks::Foundation
)
endif ()

if (ENABLE_TESTS)
target_link_libraries(Input PUBLIC Qt6::Test)
endif ()
Expand Down
5 changes: 5 additions & 0 deletions app/inputhelp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ QString InputHelp::whatsNewPostLink() const
return inputWeb + "/blog/introducing-workspaces-simplified-collaboration" + utmTagOther;
}

QString InputHelp::subscriptionBillingUrl() const
{

}

bool InputHelp::submitReportPending() const
{
return mSubmitReportPending;
Expand Down
120 changes: 0 additions & 120 deletions app/ios/iospurchasing.h

This file was deleted.

Loading

0 comments on commit aa28a4d

Please sign in to comment.