Merge branch '2.2'

KDAB · Dec 24, 2024 · 60294e3 · 60294e3
2 parents a1e2279 + 11e8181
commit 60294e3
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,9 +16,11 @@ on:
       - .github/workflows/examples.yml
     branches:
       - main
+      - 2.2
   pull_request:
     branches:
       - main
+      - 2.2
 
 jobs:
   build:

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -8,11 +8,13 @@ on:
   push:
     branches:
       - main
+      - 2.2
     paths-ignore:
       - .github/workflows/create_release.yml
   pull_request:
     branches:
       - main
+      - 2.2
 
 jobs:
   build:

diff --git a/.github/workflows/external-3rdparty-build.yml b/.github/workflows/external-3rdparty-build.yml
@@ -8,9 +8,11 @@ on:
   push:
     branches:
       - main
+      - 2.2
   pull_request:
     branches:
       - main
+      - 2.2
 
 jobs:
   build:

diff --git a/.github/workflows/flutter-dev.yml b/.github/workflows/flutter-dev.yml
@@ -10,12 +10,14 @@ on:
   push:
     branches:
       - main
+      - 2.2
     paths-ignore:
       - .github/workflows/create_release.yml
       - .github/workflows/examples.yml
   pull_request:
     branches:
       - main
+      - 2.2
 
 jobs:
   build:

diff --git a/.github/workflows/flutter-rel.yml b/.github/workflows/flutter-rel.yml
@@ -10,11 +10,13 @@ on:
   push:
     branches:
       - main
+      - 2.2
     paths-ignore:
       - .github/workflows/create_release.yml
   pull_request:
     branches:
       - main
+      - 2.2
 
 jobs:
   build:

diff --git a/.github/workflows/layouting.yml b/.github/workflows/layouting.yml
@@ -8,11 +8,13 @@ on:
   push:
     branches:
       - main
+      - 2.2
     paths-ignore:
       - .github/workflows/create_release.yml
   pull_request:
     branches:
       - main
+      - 2.2
 
 jobs:
   build:

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -7,12 +7,14 @@ name: pre-commit
 on:
   pull_request:
   push:
-    branches: [main, 2.1]
+    branches:
+      - main
+      - 2.2
 
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-    - uses: pre-commit/[email protected]
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+      - uses: pre-commit/[email protected]
diff --git a/.github/workflows/valgrind-leakcheck.yml b/.github/workflows/valgrind-leakcheck.yml
@@ -15,9 +15,11 @@ on:
       - .github/workflows/create_release.yml
     branches:
       - main
+      - 2.2
   pull_request:
     branches:
       - main
+      - 2.2
 
 jobs:
   build:

diff --git a/Changelog b/Changelog
@@ -1,6 +1,9 @@
 * v2.3.0
   - qtquick: Add QtQuick::IndicatorWindow::setQuickWindowCreationCallback
 
+* v2.2.1
+  - Fix linking against static KDDW (#557)
+
 * v2.2.0
   - qtquick: Add support for MainWindowOption_HasCentralWidget
   - qtquick: Add QtQuick::FloatingWindow::setQuickWindowCreationCallback
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,9 +8,11 @@ on: @@
       push:
         branches:
           - main
+          - 2.2
       pull_request:
         branches:
           - main
+          - 2.2
     jobs:
       build:
@@ Expand Down @@