Merge pull request #15564 from mixxxdj/sync-branch-2.6-to-main

Merge changes from `2.6` into `main`

Author: JoergAtGithub

.github/workflows/build.yml

@@ -378,8 +378,7 @@ jobs:
         env:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-        # Pinned to commit, to fix a caching issue https://github.com/Azure/trusted-signing-action/issues/62
-        uses: azure/trusted-signing-action@0d74250c661747df006298d0fb49944c10f16e03
+        uses: azure/[email protected]
         with:
           azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}

src/widget/wwidget.cpp

@@ -49,6 +49,12 @@ bool WWidget::event(QEvent* e) {
                     static_cast<int>(fonti.pixelSize() * m_scaleFactor));
         }
     } else if (isEnabled()) {
+        // With Qt6 on Windows this touch -> mouse translation is apparently not
+        // required anymore, QMouseEvents are received correctly.
+        // If enabled we receive both QTouch and QMouse events, see
+        // https://github.com/mixxxdj/mixxx/issues/15546
+        // TODO Test with other OS, maybe we can drop it entirely.
+#ifndef __WINDOWS__
         switch(e->type()) {
         case QEvent::TouchBegin:
         case QEvent::TouchUpdate:
@@ -114,6 +120,7 @@ bool WWidget::event(QEvent* e) {
         default:
             break;
         }
+#endif
     }
 
     return QWidget::event(e);