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.

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

fix the qvault change password and uses latest actions (#54) #55

Merged
merged 1 commit into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/build-wasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
branches: [main]
jobs:
build-html:
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@v0.0.1
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@v0.1.2
permissions:
pages: write
id-token: write
Expand All @@ -36,7 +36,7 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
release:
if: startsWith(github.ref, 'refs/tags/v')
needs: build-html
Expand All @@ -47,9 +47,9 @@ jobs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
path: artifacts
- name: Display structure of downloaded files
Expand Down
30 changes: 15 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ qt_standard_project_setup()
qt6_add_executable(appqmlonline
main.cpp
)
if(USE_QVault)
FetchContent_Declare(
QtVault
GIT_REPOSITORY https://github.com/EddyTheCo/QVault.git
GIT_TAG v0.1.1
FIND_PACKAGE_ARGS 0.1 CONFIG
)
FetchContent_MakeAvailable(QtVault)
target_link_libraries(appqmlonline PRIVATE QtVault::vault
$<$<STREQUAL:$<TARGET_PROPERTY:QtVault::vault,TYPE>,STATIC_LIBRARY>:QtVault::vaultplugin>
)
list(APPEND qmlimport "Esterv.Utils.Vault")
endif(USE_QVault)
if(USE_OMClient)
FetchContent_Declare(
openMeteo
Expand Down Expand Up @@ -63,8 +76,8 @@ if(USE_Iotaaccount)
FetchContent_Declare(
IotaAccount
GIT_REPOSITORY https://github.com/EddyTheCo/account.git
GIT_TAG v0.5.0
FIND_PACKAGE_ARGS 0.5 CONFIG
GIT_TAG v0.6.0
FIND_PACKAGE_ARGS 0.6 CONFIG
)
FetchContent_MakeAvailable(IotaAccount)
target_link_libraries(appqmlonline PRIVATE IotaAccount::account
Expand Down Expand Up @@ -103,19 +116,6 @@ target_compile_definitions(appqmlonline PRIVATE USE_QtQr)
list(APPEND qmlimport "Esterv.CustomControls.DateTimePickers")
endif(USE_DateTimePickers)

if(USE_QVault)
FetchContent_Declare(
QtVault
GIT_REPOSITORY https://github.com/EddyTheCo/QVault.git
GIT_TAG v0.1.0
FIND_PACKAGE_ARGS 0.1 CONFIG
)
FetchContent_MakeAvailable(QtVault)
target_link_libraries(appqmlonline PRIVATE QtVault::vault
$<$<STREQUAL:$<TARGET_PROPERTY:QtVault::vault,TYPE>,STATIC_LIBRARY>:QtVault::vaultplugin>
)
list(APPEND qmlimport "Esterv.Utils.Vault")
endif(USE_QVault)

FetchContent_Declare(
EstervDesigns
Expand Down
5 changes: 4 additions & 1 deletion wasm/examples/iotaaccount
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ Rectangle

AccountSettings
{
Layout.fillWidth:true
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
Layout.minimumWidth: 350
Layout.maximumWidth: 500
}
RowLayout
{
Expand Down
Loading