Skip to content

Commit

Permalink
fix the qvault change password and uses latest actions
Browse files Browse the repository at this point in the history
  • Loading branch information
EddyTheCo committed Feb 6, 2024
1 parent 9a7fff1 commit 92be903
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 20 deletions.
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

0 comments on commit 92be903

Please sign in to comment.