Skip to content

Commit

Permalink
⬆️ Updated QT to 6.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherFoxGuy committed Aug 13, 2024
1 parent 11280b1 commit 539b6d7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: jurplel/install-qt-action@v3
with:
cache: 'true'
version: 6.4.0
version: 6.7.2
modules: qt5compat qtpositioning qtwebchannel qtwebengine qtwebview
dir: "${{ github.workspace }}/qt/"

Expand Down
5 changes: 4 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ class Diesel(ConanFile):
settings = "os", "compiler", "build_type", "arch"
generators = "CMakeToolchain", "CMakeDeps"

def layout(self):
self.folders.generators = os.path.join(self.folders.build, "generators")

def requirements(self):
self.requires("qt6keychain/0.14.1@anotherfoxguy/stable")
self.requires("qt6keychain/0.14.3@anotherfoxguy/stable")

def generate(self):
for dep in self.dependencies.values():
Expand Down
3 changes: 3 additions & 0 deletions recipes/qtkeychain/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"0.14.3":
url: "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.14.3.tar.gz"
sha256: "a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7"
"0.14.1":
url: "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.14.1.tar.gz"
sha256: "afb2d120722141aca85f8144c4ef017bd74977ed45b80e5d9e9614015dadd60c"
3 changes: 1 addition & 2 deletions recipes/qtkeychain/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

class QtkeychainConan(ConanFile):
name = "qt6keychain"
version = "0.14.1"
license = "BSD-3"
author = "Edgar"
url = "https://github.com/AnotherFoxGuy/diesel-scm"
Expand All @@ -25,7 +24,7 @@ def generate(self):
tc.variables["QTKEYCHAIN_STATIC"] = self.options.static
tc.variables["BUILD_WITH_QT6"] = "ON"
tc.variables["BUILD_TEST_APPLICATION"] = "OFF"
tc.variables["CMAKE_PREFIX_PATH"] = "E:/Qt/6.5.0/msvc2019_64"
# tc.variables["CMAKE_PREFIX_PATH"] = "E:/Qt/6.7.2/msvc2019_64"
tc.generate()
deps = CMakeDeps(self)
deps.generate()
Expand Down

0 comments on commit 539b6d7

Please sign in to comment.