diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2021-11-22 08:34:57 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-22 08:23:24 +0000 |
commit | 93a5e61abea41a56877d044d46906dd542f8fd91 (patch) | |
tree | a13d3f6c70ee48ed5342bbe3145b9803ed8fe738 | |
parent | f1324787acb724cb050ce3cdd72bad2057152318 (diff) |
qtbase: remove unused patches
Remove mingw patches that are no longer used.
Change-Id: I20a2b7ebd317ef0ec507b02a171d872dbf0bfd49
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit d5f7c8c656c922df6acd744c2eeb31d11c8f29b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2 files changed, 0 insertions, 131 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/qt6/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/meta-boot2qt-distro/recipes-qt/qt6/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch deleted file mode 100644 index 7b13555e..00000000 --- a/meta-boot2qt-distro/recipes-qt/qt6/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 8d720921ddda76fcf77c0f7ebc5ac0b873ab1595 Mon Sep 17 00:00:00 2001 -From: David Schulz <david.schulz@theqtcompany.com> -Date: Fri, 3 Jul 2015 16:06:59 +0200 -Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment. - -Upstream-Status: Inappropriate [embedded specific] - too OE specific, probably cannot be upstreamed - -Change-Id: Ic60b32f88ee6a792b0d8938e40e2d6cb19fb93aa ---- - mkspecs/win32-g++-oe/qmake.conf | 31 ++++++++++++++++++++ - mkspecs/win32-g++-oe/qplatformdefs.h | 42 ++++++++++++++++++++++++++++ - 2 files changed, 73 insertions(+) - create mode 100644 mkspecs/win32-g++-oe/qmake.conf - create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h - -diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf -new file mode 100644 -index 0000000000..ab759e2093 ---- /dev/null -+++ b/mkspecs/win32-g++-oe/qmake.conf -@@ -0,0 +1,31 @@ -+# -+# qmake configuration for win32-g++ -+# -+# Written for MinGW-w64 / gcc 5.3 or higher -+# -+# Cross compile example for i686-w64-mingw32-g++: -+# configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32- -+# -+ -+include(../common/g++-win32.conf) -+ -+# modifications to g++-win32.conf -+ -+QMAKE_CC = $$(OE_QMAKE_CC) -+QMAKE_CFLAGS += -fno-keep-inline-dllexport $$(OE_QMAKE_CFLAGS) -+QMAKE_CFLAGS_WARN_ON += -Wextra -+ -+QMAKE_CXX = $$(OE_QMAKE_CXX) -+QMAKE_CXXFLAGS += -fno-keep-inline-dllexport -+QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -+ -+QMAKE_LINK = $$(OE_QMAKE_LINK) -+QMAKE_LINK_C = $$(OE_QMAKE_CC) -+QMAKE_LFLAGS = $$(OE_QMAKE_LDFLAGS) -+ -+QMAKE_LIB = $$(OE_QMAKE_AR) -rc -+QMAKE_RC = $$(RC) -+ -+QMAKE_STRIP = $$(OE_QMAKE_STRIP) -+ -+load(qt_config) -diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h -new file mode 100644 -index 0000000000..9d63527955 ---- /dev/null -+++ b/mkspecs/win32-g++-oe/qplatformdefs.h -@@ -0,0 +1,42 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/legal -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and Digia. For licensing terms and -+** conditions see http://qt.digia.com/licensing. For further information -+** use the contact form at http://qt.digia.com/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 2.1 requirements -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** In addition, as a special exception, Digia gives you certain additional -+** rights. These rights are described in the Digia Qt LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3.0 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU General Public License version 3.0 requirements will be -+** met: http://www.gnu.org/copyleft/gpl.html. -+** -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include "../win32-g++/qplatformdefs.h" diff --git a/meta-boot2qt-distro/recipes-qt/qt6/qtbase/0002-Disable-ltcg-for-windows-and-static-libs.patch b/meta-boot2qt-distro/recipes-qt/qt6/qtbase/0002-Disable-ltcg-for-windows-and-static-libs.patch deleted file mode 100644 index 13a079d1..00000000 --- a/meta-boot2qt-distro/recipes-qt/qt6/qtbase/0002-Disable-ltcg-for-windows-and-static-libs.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7159c1ebdfe9692718ff2c2acc1734706a712706 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Tue, 23 Oct 2018 09:54:57 +0300 -Subject: [PATCH] Disable ltcg for windows and static libs - -Disable ltcg when compiling on Windows host platform, -as GCC7 does not support lto with mingw. - -Disable also for static builds since those libraries can be linked -on Windows host, where the lto built binaries won't work. - -Task-number: QTBUG-71230 -Change-Id: I5bea76ea03bf1943b0cfaf03d46a4840bd99a28b -Upstream-Status: Inappropriate [embedded specific] ---- - mkspecs/features/ltcg.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf -index dc1d196..78279bc 100644 ---- a/mkspecs/features/ltcg.prf -+++ b/mkspecs/features/ltcg.prf -@@ -1,6 +1,6 @@ - static:no-static-ltcg { - # Static library but no-static-ltcg enabled: skip LTCG --} else: CONFIG(release, debug|release):!host_build { -+} else: CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib { - separate_debug_info { - # Evaluate single-$ variable references that have no valid value at mkspec loading time - QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO ~= s/\\$\\{/\$\$\{/ |