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

submodule changes from #1119 PR #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

submodule changes from #1119 PR #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c112e79
c++20
Tatsujin1978 May 12, 2024
c7e31b9
Merge branch 'task/cpp20_SYNC'
Tatsujin1978 May 29, 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: 2 additions & 2 deletions examples/auth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
add_executable(authclient client.cpp)
target_link_libraries(authclient qhttpengine)
set_target_properties(authclient PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 20
)
install(TARGETS authclient
RUNTIME DESTINATION "${EXAMPLE_DIR}"
Expand All @@ -13,7 +13,7 @@ install(TARGETS authclient
add_executable(authserver server.cpp)
target_link_libraries(authserver qhttpengine)
set_target_properties(authserver PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 20
)
install(TARGETS authserver
RUNTIME DESTINATION "${EXAMPLE_DIR}"
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ endif()
add_library(qhttpengine STATIC ${HEADERS} ${SRC})

set_target_properties(qhttpengine PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
DEFINE_SYMBOL QT_NO_SIGNALS_SLOTS_KEYWORDS
DEFINE_SYMBOL QHTTPENGINE_LIBRARY
Expand Down
4 changes: 2 additions & 2 deletions src/src/localfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017 Nathan Osman
* Copyright (c) 2017-2024 Nathan Osman
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
Expand Down Expand Up @@ -61,7 +61,7 @@ bool LocalFilePrivate::setPermission()
ea.grfAccessMode = GRANT_ACCESS;
ea.grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
ea.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
ea.Trustee.ptstrName = L"CURRENT_USER";
ea.Trustee.ptstrName = const_cast<LPWCH>(L"CURRENT_USER");

// Create a new ACL with a single access control entry
PACL pACL;
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ qt5_add_resources(QRC resource.qrc)
foreach(TEST ${TESTS})
add_executable(${TEST} ${TEST}.cpp ${QRC})
set_target_properties(${TEST} PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
)
target_include_directories(${TEST} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion tests/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(SRC

add_library(common STATIC ${SRC})
set_target_properties(common PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
)
target_link_libraries(common Qt5::Network qhttpengine)