#1601 - Patch for x2goclient Qt5 build on Windows

X2Go Bug report logs - #1601
Patch for x2goclient Qt5 build on Windows

Reported by: Orion Poplawski <orion@nwra.com>

Date: Tue, 9 May 2023 17:00:01 UTC

Severity: normal

Tags: patch

Found in version 4.1.2.2

Received: (at 1601) by bugs.x2go.org; 9 May 2023 17:28:07 +0000
From ulrich.sibiller@gmail.com  Tue May  9 19:28:06 2023
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
	ymir.das-netzwerkteam.de
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,FREEMAIL_REPLYTO,
	FREEMAIL_REPLYTO_END_DIGIT,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,
	URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2
Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30])
	by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id 2E56D5DAEE;
	Tue,  9 May 2023 19:28:06 +0200 (CEST)
Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-192d5ab4962so3759768fac.3;
        Tue, 09 May 2023 10:28:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20221208; t=1683653285; x=1686245285;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :reply-to:in-reply-to:references:mime-version:from:to:cc:subject
         :date:message-id:reply-to;
        bh=pYJ0gQ1EAgQRTkA+IAag/TmFRQvPMpdUzIJS36c2hAI=;
        b=Y7mBVupdCaWsKaPLApdlfJYEMF99IErfyjGV9IRel9DClkOUEVGcO5gaLeFUCiZcgt
         SQ0CQEkVtTf31gyQb/VsYEE4nHYgL5TkcYG9cIk8IGXclvn4tO+aXgXFekLKDtje9cMs
         ifNlPYVMBHDdWfsOTW4lYd0dwp5KB7Dl9AQ6bPQS4F6CGaGUy0ud+jQ9Men5K8ARavkX
         EvCZRo2j4ZEELdMBekAIe1YANRV2XfnFff8CsHptuwuHzM+Q1l1KtmPlrMd1hIQvRy4S
         KDteeya7Gvfv34rx0P33/f1V6iLC3APQvuM+GoKXFL4VUTwy55eIfCN5Gtbiz78IHTfe
         oDiw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20221208; t=1683653285; x=1686245285;
        h=content-transfer-encoding:cc:to:subject:message-id:date:from
         :reply-to:in-reply-to:references:mime-version:x-gm-message-state
         :from:to:cc:subject:date:message-id:reply-to;
        bh=pYJ0gQ1EAgQRTkA+IAag/TmFRQvPMpdUzIJS36c2hAI=;
        b=UJRqUiXDFGPSd5VTAMdCBtyib/vWJ0bW1uCf0xqbaCiwm2Kj8u/H/7MBQsPpjJBrlH
         SjCR9cxnmqH5NhOaz5dbyl+UFooVAxZ5kSDG92cd/tF+F3oEALnSnS7l82b5EXB+BOAc
         AT8PvysA9GqCt8tpifHZb8aEAZhdm4SozBKQKMxCyCK/0bkzpozdiSI44JQzEO0WZ7xF
         LU+ydnsO9Q47wTmx2bzQdksgccBbgII6pBt/4Y9Dca3UkggoXnGnLaGZTnEwp4ub/d24
         SXFyuPnRRq38A7iRg38IT6GoRuGoVe9XzA0WI9ZdtXs+8mj7vQVywggsxBrJNAUC12Ij
         VAqw==
X-Gm-Message-State: AC+VfDzZRI4KWktzsoSERXHn/7sv8pDu9Sanc7pvdeHP0wrORlB7SrT8
	0wpZTZ7ECtEucE1ziouxlLBAi0i6HR+6Iwpm8y7kTlFtDEk=
X-Google-Smtp-Source: ACHHUZ5ZV/U2q3aQ4cbG0C0x/urNk3OIhYu9myPGEJP3SEmR1nZ8y5ecMxt9cOmi6r/OKlWkV3bvZCdg4r9arbyVMLE=
X-Received: by 2002:a05:6870:d343:b0:187:98c4:2766 with SMTP id
 h3-20020a056870d34300b0018798c42766mr7299748oag.14.1683653284095; Tue, 09 May
 2023 10:28:04 -0700 (PDT)
MIME-Version: 1.0
References: <04e068b1-91de-5d88-1e8f-e836cbbd028d@nwra.com> <CANVnVY+=cw9K-fsBT6p72kwW0zABQscQQ1TNwKR+1r0-1NGYvA@mail.gmail.com>
In-Reply-To: <CANVnVY+=cw9K-fsBT6p72kwW0zABQscQQ1TNwKR+1r0-1NGYvA@mail.gmail.com>
Reply-To: uli42@gmx.de
From: Ulrich Sibiller <ulrich.sibiller@gmail.com>
Date: Tue, 9 May 2023 19:27:38 +0200
Message-ID: <CANVnVY+vsPeNxz9C05vegOnvNoBqx0FKgMAruKMa=BF28sxU-g@mail.gmail.com>
Subject: Re: [X2Go-Dev] Bug#1601: Patch for x2goclient Qt5 build on Windows
To: Orion Poplawski <orion@nwra.com>, 1601@bugs.x2go.org
Cc: submit@bugs.x2go.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi again, the current upstream of x2goclient contains these lines. So it looks like your QT_VERSION is not set correctly. (see https://code.x2go.org/gitweb?p=x2goclient.git;a=blob;f=src/wapi.cpp;h=12732c24b7b7cbf2da4cc8b0d0d9f782646960d3;hb=HEAD) Uli On Tue, May 9, 2023 at 7:25 PM Ulrich Sibiller <ulrich.sibiller@gmail.com> wrote: > > Iirc I have made some patches for the windows version. I thought they had been merged but I must check that. For now try this: > > > #if QT_VERSION >= 0x050200 > 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 > > > Uli > > Orion Poplawski <orion@nwra.com> schrieb am Di., 9. Mai 2023, 19:00: >> >> Package: x2goclient >> Version: 4.1.2.2 >> Tag: patch >> >> >> When compiling against Qt5 5.15.9 I get: >> >> ../src/wapi.cpp: In function 'void wapiSetWindowIcon(HWND, const QPixmap&)': >> ../src/wapi.cpp:224:88: error: 'class QPixmap' has no member named >> 'toWinHICON' >> 224 | largeIcon=icon.scaled(iconx,icony, >> Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON (); >> | ^~~~~~~~~~ >> ../src/wapi.cpp:225:90: error: 'class QPixmap' has no member named >> 'toWinHICON' >> 225 | smallIcon=icon.scaled(smallx,smally, >> Qt::IgnoreAspectRatio,Qt::SmoothTransformation).toWinHICON (); >> | ^~~~~~~~~~ >> >> Now, the only call to wapiSetWindowIcon() is commented out, so I just >> commented out the wapiSetWindowIcon() code as we... Looks like the >> current function to use is QImage::toHICON(). >> >> I'm also curious that you need to shift to a Windows API call - >> shouldn't we be able to do everything in Qt? >> >> >> >> -- >> Orion Poplawski >> he/him/his - surely the least important thing about me >> IT Systems Manager 720-772-5637 >> NWRA, Boulder/CoRA Office FAX: 303-415-9702 >> 3380 Mitchell Lane orion@nwra.com >> Boulder, CO 80301 https://www.nwra.com/_______________________________________________ >> x2go-dev mailing list >> x2go-dev@lists.x2go.org >> https://lists.x2go.org/listinfo/x2go-dev

X2Go Developers <owner@bugs.x2go.org>. Last modified: Sat Nov 23 21:13:36 2024; Machine Name: ymir.das-netzwerkteam.de

X2Go Bug tracking system

Debbugs is free software and licensed under the terms of the GNU Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.

X2Go Bug report logs - #1601 Patch for x2goclient Qt5 build on Windows

X2Go Bug report logs - #1601
Patch for x2goclient Qt5 build on Windows