[neon/qt/qtsystems] debian/patches: debian/patches: Add 1004_mark-as-override.patch. Fix FTBFS (with -Werror) in lomiri-ui-toolkit.

Mike Gabriel null at kde.org
Tue Feb 21 10:05:47 GMT 2023


Git commit 26d984415b1382dc7fc24cc0b1ba0697216ea22c by Mike Gabriel.
Committed on 23/07/2022 at 21:16.
Pushed by carlosdem into branch 'master'.

debian/patches: Add 1004_mark-as-override.patch. Fix FTBFS (with -Werror) in lomiri-ui-toolkit.

A  +102  -0    debian/patches/1004_mark-as-override.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtsystems/commit/26d984415b1382dc7fc24cc0b1ba0697216ea22c

diff --git a/debian/patches/1004_mark-as-override.patch b/debian/patches/1004_mark-as-override.patch
new file mode 100644
index 0000000..5168f8a
--- /dev/null
+++ b/debian/patches/1004_mark-as-override.patch
@@ -0,0 +1,102 @@
+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 @@
+     void temperatureChanged(float temperature);
+ 
+ protected:
+-    void connectNotify(const QMetaMethod &signal);
+-    void disconnectNotify(const QMetaMethod &signal);
++    void connectNotify(const QMetaMethod &signal) override;
++    void disconnectNotify(const QMetaMethod &signal) override;
+ 
+ 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 @@
+     void bluetoothStateChanged(bool on);
+ 
+ protected:
+-    void connectNotify(const QMetaMethod &signal);
+-    void disconnectNotify(const QMetaMethod &signal);
++    void connectNotify(const QMetaMethod &signal) override;
++    void disconnectNotify(const QMetaMethod &signal) override;
+ 
+ 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 @@
+     void networkStatusChanged(QNetworkInfo::NetworkMode mode, int interfaceDevice, QNetworkInfo::NetworkStatus status);
+ 
+ protected:
+-    void connectNotify(const QMetaMethod &signal);
+-    void disconnectNotify(const QMetaMethod &signal);
++    void connectNotify(const QMetaMethod &signal) override;
++    void disconnectNotify(const QMetaMethod &signal) override;
+ 
+ private:
+     Q_DISABLE_COPY(QNetworkInfo)
diff --git a/debian/patches/series b/debian/patches/series
index a350c2f..c44de89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 2001_build_with_udisk.patch
 2002_skip_failing_tests.patch
 1003_typo-fixes.patch
+1004_mark-as-override.patch



More information about the Neon-commits mailing list