Merge pull request #571 from psieg/qt

Update to Qt6 for windows builds
psieg · Jan 22, 2023 · 8021e81 · 8021e81
2 parents a3c32be + 91b00c2
commit 8021e81
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -105,18 +105,13 @@ jobs:
           submodules: recursive
       - run: choco install --no-progress openssl
       - uses: ilammy/msvc-dev-cmd@v1
-      - name: Cached Qt
-        id: cache-qt
-        uses: actions/cache@v2
-        with:
-          path: C:\Qt
-          key: ${{ runner.os }}-qt
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
-          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+          cache: true
           dir: C:\Qt
-          modules: serialport
+          version: 6.*
+          modules: qtserialport
       - name: Cached Bass
         id: cache-bass
         uses: actions/cache@v2
@@ -160,7 +155,7 @@ jobs:
       - name: Build
         shell: cmd
         run: |
-          set QTDIR=%Qt5_Dir%
+          set QTDIR=%Qt6_Dir%
           call scripts\win32\generate_sln.bat
           MSBuild.exe Lightpack.sln /p:Configuration=Release
       - name: Prepare Installer
@@ -170,7 +165,7 @@ jobs:
       - name: Build Installer
         shell: cmd
         run: |
-          "C:/Program Files (x86)/Inno Setup 6/ISCC.exe" script.iss
+          "C:/Program Files (x86)/Inno Setup 6/ISCC.exe" script_qt6.iss
         working-directory: ./Software/dist_windows
       - name: Check Package
         shell: bash
@@ -237,16 +232,12 @@ jobs:
         run: |
           export PATH=$QTDIR/bin:$PATH
           qmake -r
-          # post-12.4 xcode workaround
-          # clang confuses VERSION file with <version> header and breaks
-          mv VERSION VERSION.bak
           make
-          mv VERSION.bak VERSION
           macdeployqt bin/Prismatik.app -dmg
       - name: Check Package
         run: |
           set -xe
-          VERSION=`cat VERSION`
+          VERSION=`cat RELEASE_VERSION`
           PKG_PATH="Software/bin/Prismatik.dmg"
           PKG_NAME="Prismatik_${VERSION}.dmg"
           echo "PKG_PATH=$PKG_PATH" >> $GITHUB_ENV

diff --git a/Software/VERSION → Software/RELEASE_VERSION b/Software/VERSION → Software/RELEASE_VERSION
diff --git a/Software/dist_linux/dpkg/build.sh b/Software/dist_linux/dpkg/build.sh
@@ -7,7 +7,7 @@ qmake -r
 make
 cd -
 
-VERSION=`cat ../../VERSION`
+VERSION=`cat ../../RELEASE_VERSION`
 
 arch=amd64
 [ ! -z $1 ] && arch=$1

diff --git a/Software/dist_linux/flatpak/build.sh b/Software/dist_linux/flatpak/build.sh
@@ -2,7 +2,7 @@
 kde_version=5.15
 flatpak_id=de.psieg.Prismatik
 destdir=tmp
-VERSION=`cat ../../VERSION`
+VERSION=`cat ../../RELEASE_VERSION`
 
 set -xe
 

diff --git a/Software/dist_linux/pacman/PKGBUILD.template b/Software/dist_linux/pacman/PKGBUILD.template
@@ -16,7 +16,7 @@ _pkgdir=../../package_template
 _srcdir=../../..
 
 pkgver() {
-    cat ${_srcdir}/VERSION
+    cat ${_srcdir}/RELEASE_VERSION
 }
 
 build() {

diff --git a/Software/grab/DDuplGrabber.cpp b/Software/grab/DDuplGrabber.cpp
@@ -85,6 +85,25 @@ struct DDuplScreenData
 	DXGI_MAPPED_RECT surfaceMap;
 };
 
+DWORD WINAPI DDuplGrabberThreadProc(LPVOID arg) {
+	DDuplGrabber* _this = (DDuplGrabber*)arg;
+	DWORD errorcode;
+
+	while (true) {
+		if (WAIT_OBJECT_0 == (errorcode = WaitForSingleObject(_this->m_threadEvent, INFINITE))) {
+			switch (_this->m_threadCommand) {
+			case Exit:
+				SetEvent(_this->m_threadReturnEvent);
+				return 0;
+			case Reallocate:
+				_this->m_threadReallocateResult = _this->_reallocate(_this->m_threadReallocateArg);
+				break;
+			}
+			SetEvent(_this->m_threadReturnEvent);
+		}
+	}
+}
+
 DDuplGrabber::DDuplGrabber(QObject * parent, GrabberContext *context)
 	: GrabberBase(parent, context),
 	m_state(Uninitialized),
@@ -185,25 +204,6 @@ bool DDuplGrabber::recreateAdapters() {
 	return true;
 }
 
-DWORD WINAPI DDuplGrabberThreadProc(LPVOID arg) {
-	DDuplGrabber* _this = (DDuplGrabber*)arg;
-	DWORD errorcode;
-
-	while (true) {
-		if (WAIT_OBJECT_0 == (errorcode = WaitForSingleObject(_this->m_threadEvent, INFINITE))) {
-			switch (_this->m_threadCommand) {
-			case Exit:
-				SetEvent(_this->m_threadReturnEvent);
-				return 0;
-			case Reallocate:
-				_this->m_threadReallocateResult = _this->_reallocate(_this->m_threadReallocateArg);
-				break;
-			}
-			SetEvent(_this->m_threadReturnEvent);
-		}
-	}
-}
-
 bool DDuplGrabber::runThreadCommand(DWORD timeout) {
 	DWORD errorcode;
 	SetEvent(m_threadEvent);

diff --git a/Software/grab/grab.pro b/Software/grab/grab.pro
@@ -100,6 +100,8 @@ win32 {
         QMAKE_CXXFLAGS += /MP
         # Fix __cplusplus macro as required by Qt
         QMAKE_CXXFLAGS += /Zc:__cplusplus
+        # As required by Qt
+        QMAKE_CXXFLAGS += /permissive-
         # Create "fake" project dependencies of the libraries used dynamically
         LIBS += -lprismatik-hooks -llibraryinjector -lprismatik-unhook
 

diff --git a/Software/src/src.pro b/Software/src/src.pro
@@ -98,6 +98,8 @@ win32 {
         QMAKE_CXXFLAGS += /MP
         # Fix __cplusplus macro as required by Qt
         QMAKE_CXXFLAGS += /Zc:__cplusplus
+        # As required by Qt
+        QMAKE_CXXFLAGS += -permissive-
         # Place *.lib and *.exp files in ../lib
         QMAKE_LFLAGS += /IMPLIB:..\\lib\\$(TargetName).lib
     }