[neon/qt/qtsystems] debian: Update 1004_mark-as-override.patch to add override keyword only to *.h.
Dmitry Shachnev
null at kde.org
Tue Feb 21 10:05:48 GMT 2023
Git commit 44d85a47e316df25de7c7b54c208b2bc3a70fdc3 by Dmitry Shachnev.
Committed on 12/08/2022 at 10:16.
Pushed by carlosdem into branch 'master'.
Update 1004_mark-as-override.patch to add override keyword only to *.h.
Closes: #1016274.
M +3 -0 debian/changelog
M +0 -60 debian/patches/1004_mark-as-override.patch
https://invent.kde.org/neon/qt/qtsystems/commit/44d85a47e316df25de7c7b54c208b2bc3a70fdc3
diff --git a/debian/changelog b/debian/changelog
index 64bf4dc..fb39f6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
qtsystems-opensource-src (5.0~git20190103.e3332ee+dfsg1-3) UNRELEASED; urgency=medium
+ [ Dmitry Shachnev ]
+ * Update 1004_mark-as-override.patch to add override keyword only to *.h,
+ not to *.cpp (closes: #1016274).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 12 Aug 2022 13:14:29 +0300
diff --git a/debian/patches/1004_mark-as-override.patch b/debian/patches/1004_mark-as-override.patch
index 5168f8a..7c85e09 100644
--- a/debian/patches/1004_mark-as-override.patch
+++ b/debian/patches/1004_mark-as-override.patch
@@ -1,26 +1,6 @@
Description: Mark connectNotify and disconnectNotify methods with 'override'.
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/src/systeminfo/qbatteryinfo.cpp
-+++ b/src/systeminfo/qbatteryinfo.cpp
-@@ -379,7 +379,7 @@
- /*!
- \internal
- */
--void QBatteryInfo::connectNotify(const QMetaMethod &signal)
-+void QBatteryInfo::connectNotify(const QMetaMethod &signal) override
- {
- #if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(QT_SIMULATOR) || defined(Q_OS_MAC)
- QMetaMethod sourceSignal = proxyToSourceSignal(signal, d_ptr);
-@@ -392,7 +392,7 @@
- /*!
- \internal
- */
--void QBatteryInfo::disconnectNotify(const QMetaMethod &signal)
-+void QBatteryInfo::disconnectNotify(const QMetaMethod &signal) override
- {
- #if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(QT_SIMULATOR) || defined(Q_OS_MAC)
- // We can only disconnect with the private implementation, when there is no receivers for the signal.
--- a/src/systeminfo/qbatteryinfo.h
+++ b/src/systeminfo/qbatteryinfo.h
@@ -145,8 +145,8 @@
@@ -34,26 +14,6 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
private:
Q_DISABLE_COPY(QBatteryInfo)
---- a/src/systeminfo/qdeviceinfo.cpp
-+++ b/src/systeminfo/qdeviceinfo.cpp
-@@ -305,7 +305,7 @@
- /*!
- \internal
- */
--void QDeviceInfo::connectNotify(const QMetaMethod &signalSig)
-+void QDeviceInfo::connectNotify(const QMetaMethod &signalSig) override
- {
- #if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_MAC)
- QMetaMethod sourceSignal = proxyToSourceSignal(signalSig, reinterpret_cast<QObject *>(d_ptr));
-@@ -318,7 +318,7 @@
- /*!
- \internal
- */
--void QDeviceInfo::disconnectNotify(const QMetaMethod &signalSig)
-+void QDeviceInfo::disconnectNotify(const QMetaMethod &signalSig) override
- {
- #if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_MAC)
- // We can only disconnect with the private implementation, when there is no receivers for the signal.
--- a/src/systeminfo/qdeviceinfo.h
+++ b/src/systeminfo/qdeviceinfo.h
@@ -130,8 +130,8 @@
@@ -67,26 +27,6 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
private:
Q_DISABLE_COPY(QDeviceInfo)
---- a/src/systeminfo/qnetworkinfo.cpp
-+++ b/src/systeminfo/qnetworkinfo.cpp
-@@ -352,7 +352,7 @@
- /*!
- \internal
- */
--void QNetworkInfo::connectNotify(const QMetaMethod &signal)
-+void QNetworkInfo::connectNotify(const QMetaMethod &signal) override
- {
- #if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_MAC)
- QMetaMethod sourceSignal = proxyToSourceSignal(signal, d_ptr);
-@@ -365,7 +365,7 @@
- /*!
- \internal
- */
--void QNetworkInfo::disconnectNotify(const QMetaMethod &signal)
-+void QNetworkInfo::disconnectNotify(const QMetaMethod &signal) override
- {
- #if defined(Q_OS_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_MAC)
- // We can only disconnect with the private implementation, when there is no receivers for the signal.
--- a/src/systeminfo/qnetworkinfo.h
+++ b/src/systeminfo/qnetworkinfo.h
@@ -120,8 +120,8 @@
More information about the Neon-commits
mailing list