Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop qjsonwrapper dependency #59731

Merged
merged 10 commits into from
Dec 4, 2024
Merged

Drop qjsonwrapper dependency #59731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e1f423a
Macro should be HAVE_GUI, not WITH_GUI
nyalldawson Dec 3, 2024
e52b6b9
Fix build
nyalldawson Dec 3, 2024
acb9912
Fix clazy warning
nyalldawson Dec 3, 2024
a93c22d
Avoid some unnecessary use of qjsonwrapper
nyalldawson Dec 3, 2024
96442ec
Directly set serialization values for oauth2 config
nyalldawson Dec 3, 2024
da97751
Drop unused qjsonwrapper external library
nyalldawson Dec 3, 2024
dd944cf
Only set properties when present in json
nyalldawson Dec 4, 2024
f532021
Harden enum access
nyalldawson Dec 4, 2024
5018e2e
Fix clang-tidy warning
nyalldawson Dec 4, 2024
0e741c6
Remove useless test
nyalldawson Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,6 @@ Files: src/app/qtmain_android.cpp
Copyright: 2009-2011, BogDan Vatra <[email protected]>
License: BSD-3-Clause

Files: src/auth/oauth2/qjsonwrapper/*
Copyright: 2014, Uwe L. Korn <[email protected]>
License: MIT

Files: src/core/pal/*
Copyright: 2008, Maxence Laurent, MIS-TIC, HEIG-VD
License: GPL-3+
Expand Down
136 changes: 0 additions & 136 deletions external/qjsonwrapper/Json.cpp
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions external/qjsonwrapper/Json.h
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions external/qjsonwrapper/LICENSE
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions external/qjsonwrapper/README.md
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/auth/oauth2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ set(AUTH_OAUTH2_SRCS
core/qgso2.cpp
core/qgsauthoauth2config.cpp
core/qgsauthoauth2method.cpp
${CMAKE_SOURCE_DIR}/external/qjsonwrapper/Json.cpp
)

set(AUTH_OAUTH2_HDRS
core/qgsauthoauth2config.h
core/qgsauthoauth2method.h
core/qgso2.h
${CMAKE_SOURCE_DIR}/external/qjsonwrapper/Json.h
)

if(WITH_INTERNAL_O2)
Expand Down Expand Up @@ -124,7 +122,6 @@ else()
endif()

target_include_directories(authmethod_oauth2_a PRIVATE
${CMAKE_SOURCE_DIR}/external/qjsonwrapper
${CMAKE_SOURCE_DIR}/src/auth/oauth2/core
)
if (WITH_GUI)
Expand All @@ -145,7 +142,6 @@ else()
add_library(authmethod_oauth2 MODULE ${AUTH_OAUTH2_SRCS} ${AUTH_OAUTH2_HDRS} ${AUTH_OAUTH2_RCCS} ${AUTH_OAUTH2_UIS_H})

target_include_directories(authmethod_oauth2 PRIVATE
${CMAKE_SOURCE_DIR}/external/qjsonwrapper
${CMAKE_SOURCE_DIR}/src/auth/oauth2/core
)

Expand Down
Loading
Loading