[neon/qt6/qt6-base/Neon/release] debian/patches: delete upstreamed patch

Carlos De Maine null at kde.org
Fri Apr 11 12:06:50 BST 2025


Git commit 885f5d20a6e51e97a76253b7d0eb46b252cd78eb by Carlos De Maine.
Committed on 11/04/2025 at 11:06.
Pushed by carlosdem into branch 'Neon/release'.

delete upstreamed patch

D  +0    -21   debian/patches/a43c7e58046604796aa69974ea1c5d3e2648c755.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-base/-/commit/885f5d20a6e51e97a76253b7d0eb46b252cd78eb

diff --git a/debian/patches/a43c7e58046604796aa69974ea1c5d3e2648c755.diff b/debian/patches/a43c7e58046604796aa69974ea1c5d3e2648c755.diff
deleted file mode 100644
index bbe4953..0000000
--- a/debian/patches/a43c7e58046604796aa69974ea1c5d3e2648c755.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 94f3e60deba52b880e21ac01134a9446e89535e1..5f6042be29dffff6fb3934ed0ec116f5d0d94911 100644
---- a/src/corelib/global/qlibraryinfo.cpp
-+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -6,6 +6,7 @@
- #include "qstringlist.h"
- #include "qfile.h"
- #if QT_CONFIG(settings)
-+#include "qresource.h"
- #include "qsettings.h"
- #endif
- #include "qlibraryinfo.h"
-@@ -103,7 +104,7 @@ static std::unique_ptr<QSettings> findConfiguration()
-         return std::make_unique<QSettings>(*qtconfManualPath, QSettings::IniFormat);
- 
-     QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
--    if (QFile::exists(qtconfig))
-+    if (QResource(qtconfig, QLocale::c()).isValid())
-         return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
- #ifdef Q_OS_DARWIN
-     CFBundleRef bundleRef = CFBundleGetMainBundle();
diff --git a/debian/patches/series b/debian/patches/series
index 6d8be4b..874bf2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Neon added
-a43c7e58046604796aa69974ea1c5d3e2648c755.diff
 
 # Needs to be fixed upstream.
 Add-SH-detection.patch


More information about the Neon-commits mailing list