Replace qdevicediscovery_dummy.diff with a proper patch from upstream.

1 files changed, 32 insertions, 28 deletions

diff --git a/debian/patches/qdevicediscovery_dummy.diff b/debian/patches/qdevicediscovery_dummy.diff
index 416cc20..ca3365e 100644
--- a/debian/patches/qdevicediscovery_dummy.diff
+++ b/debian/patches/qdevicediscovery_dummy.diff
@@ -1,30 +1,34 @@
-Description: add a destructor to QDeviceDiscoveryDummy
- Otherwise, the linker fails because of undefined reference to
- 'vtable for QDeviceDiscoveryDummy'.
-Author: Dmitry Shachnev <mitya57@debian.org>
-Forwarded: not-yet
-Last-Update: 2016-06-29
+Description: remove linux only-dependency from devicediscovery
+Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=dd8745e1d4beedfb
+Last-Update: 2016-07-03
 
---- a/src/platformsupport/devicediscovery/qdevicediscovery_dummy.cpp
-+++ b/src/platformsupport/devicediscovery/qdevicediscovery_dummy.cpp
-@@ -51,6 +51,10 @@
- {
- }
- 
-+QDeviceDiscoveryDummy::~QDeviceDiscoveryDummy()
-+{
-+}
-+
- QStringList QDeviceDiscoveryDummy::scanConnectedDevices()
- {
-     return QStringList();
---- a/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h
-+++ b/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h
-@@ -61,6 +61,7 @@
- 
- public:
-     QDeviceDiscoveryDummy(QDeviceTypes types, QObject *parent = 0);
-+    ~QDeviceDiscoveryDummy();
-     QStringList scanConnectedDevices() Q_DECL_OVERRIDE;
- };
+--- a/src/platformsupport/devicediscovery/devicediscovery.pri
++++ b/src/platformsupport/devicediscovery/devicediscovery.pri
+@@ -1,18 +1,14 @@
+ HEADERS += $$PWD/qdevicediscovery_p.h
  
+-linux {
+-    contains(QT_CONFIG, libudev) {
+-        SOURCES += $$PWD/qdevicediscovery_udev.cpp
+-        HEADERS += $$PWD/qdevicediscovery_udev_p.h
+-        INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV
+-        LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
+-    } else: contains(QT_CONFIG, evdev) {
+-        SOURCES += $$PWD/qdevicediscovery_static.cpp
+-        HEADERS += $$PWD/qdevicediscovery_static_p.h
+-    } else {
+-        SOURCES += $$PWD/qdevicediscovery_dummy.cpp
+-        HEADERS += $$PWD/qdevicediscovery_dummy_p.h
+-    }
++contains(QT_CONFIG, libudev) {
++    SOURCES += $$PWD/qdevicediscovery_udev.cpp
++    HEADERS += $$PWD/qdevicediscovery_udev_p.h
++    INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV
++    LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
++} else: contains(QT_CONFIG, evdev) {
++    SOURCES += $$PWD/qdevicediscovery_static.cpp
++    HEADERS += $$PWD/qdevicediscovery_static_p.h
+ } else {
+     SOURCES += $$PWD/qdevicediscovery_dummy.cpp
++    HEADERS += $$PWD/qdevicediscovery_dummy_p.h
+ }