diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2016-10-21 10:55:04 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2016-10-21 10:55:04 +0300 |
| commit | 3a7cbea8faf716e35d0f3f4de22ffd30539ece53 (patch) | |
| tree | 3f7e3e3752cadeffc278e6e17ada6263f5c4ba85 /debian/patches | |
| parent | cbdf1f0025988926f863ff4934d5e8a7a0139e19 (diff) | |
| download | qtbase-3a7cbea8faf716e35d0f3f4de22ffd30539ece53.tar.gz | |
Drop debian/patches/qdevicediscovery_dummy.diff, applied upstream.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/qdevicediscovery_dummy.diff | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/debian/patches/qdevicediscovery_dummy.diff b/debian/patches/qdevicediscovery_dummy.diff deleted file mode 100644 index ca3365e..0000000 --- a/debian/patches/qdevicediscovery_dummy.diff +++ /dev/null @@ -1,34 +0,0 @@ -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/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 - } diff --git a/debian/patches/series b/debian/patches/series index ce2e1a1..c7b0d06 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,5 +7,4 @@ no_htmlinfo_example.diff remove_privacy_breachs.diff link_fbclient.diff gnukfreebsd_cloexec.diff -qdevicediscovery_dummy.diff armv4.diff |