This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 7459a9aedf960c7de5c58725afb678fe678ef01e Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Feb 17 13:31:46 2022 -0600 Fixed build with Qt5 on Windows. --- debian/changelog | 1 + src/wapi.cpp | 10 ++++++++-- x2goclient.pro | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 379d20b..7630105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - Replace QFont::Thin with 0 to keep compatibility with Qt4. - Add special ACL for exported directories in Windows client. - Support for rootless X2GoKdrive sessions. + - Fixed build with Qt5 on Windows. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/wapi.cpp b/src/wapi.cpp index 2a889ba..c610b19 100644 --- a/src/wapi.cpp +++ b/src/wapi.cpp @@ -31,7 +31,9 @@ #include "wapi.h" #include "x2gologdebug.h" - +#if QT_VERSION > 0x050000 +#include <QtWin> +#endif long wapiSetFSWindow ( HWND hWnd, const QRect& desktopGeometry ) { @@ -224,9 +226,13 @@ void wapiSetWindowIcon ( HWND wnd, const QPixmap& icon) HICON largeIcon=0; HICON smallIcon=0; +#if QT_VERSION > 0x050000 + largeIcon=QtWin::toHICON(icon.scaled(iconx,icony, Qt::IgnoreAspectRatio,Qt::SmoothTransformation)); + smallIcon=QtWin::toHICON(icon.scaled(smallx,smally, Qt::IgnoreAspectRatio,Qt::SmoothTransformation)); +#else largeIcon=icon.scaled(iconx,icony, Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON (); smallIcon=icon.scaled(smallx,smally, Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON (); - +#endif x2goDebug<<"Large icon: "<<largeIcon<<iconx<<"x"<<icony; x2goDebug<<"Small icon: "<<smallIcon<<smallx<<"x"<<smally; int rez=SetClassLong(wnd,GCL_HICON, (LONG)largeIcon); diff --git a/x2goclient.pro b/x2goclient.pro index 4489874..3d80ac2 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -270,7 +270,12 @@ win32-* { CONFIG += static release } QT += svg network +linux|linux-* { greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras +} +win32-* { +greaterThan(QT_MAJOR_VERSION, 4): QT += winextras +} QMAKE_CXXFLAGS_DEBUG -= -g QMAKE_CXXFLAGS_DEBUG += -O2 -g3 -ggdb3 -gdwarf-4 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git