From ee54b2cfca9444e5cee3ac18ad4876b848fe6d11 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Fri, 28 Jun 2024 14:49:16 +0200 Subject: [PATCH] Terminal: Remove TOO_OLD_WINSDK check from libptyqt Qt Creator will always use newer Windows SDKs, as we require at least Windows 10 1809. The define for TOO_OLD_WINSDK was done arbitrarily and broke (LLVM-)MinGW builds. Change-Id: If8e1fd4e0e3615bda23483877e67988ca04ea9f7 Reviewed-by: Marcus Tillmanns --- src/libs/3rdparty/libptyqt/conptyprocess.cpp | 4 ---- src/libs/3rdparty/libptyqt/conptyprocess.h | 1 - 2 files changed, 5 deletions(-) diff --git a/src/libs/3rdparty/libptyqt/conptyprocess.cpp b/src/libs/3rdparty/libptyqt/conptyprocess.cpp index 94bb53b5832..c957e0bdd9e 100644 --- a/src/libs/3rdparty/libptyqt/conptyprocess.cpp +++ b/src/libs/3rdparty/libptyqt/conptyprocess.cpp @@ -1132,10 +1132,6 @@ qint64 ConPtyProcess::write(const QByteArray &byteArray) bool ConPtyProcess::isAvailable() { -#ifdef TOO_OLD_WINSDK - return false; //very importnant! ConPty can be built, but it doesn't work if built with old sdk and Win10 < 1903 -#endif - qint32 buildNumber = QSysInfo::kernelVersion().split(".").last().toInt(); if (buildNumber < CONPTY_MINIMAL_WINDOWS_VERSION) return false; diff --git a/src/libs/3rdparty/libptyqt/conptyprocess.h b/src/libs/3rdparty/libptyqt/conptyprocess.h index aaf56fe76f1..0f30288dab9 100644 --- a/src/libs/3rdparty/libptyqt/conptyprocess.h +++ b/src/libs/3rdparty/libptyqt/conptyprocess.h @@ -20,7 +20,6 @@ typedef VOID* HPCON; -#define TOO_OLD_WINSDK #endif class QWinEventNotifier;