diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-11-24 10:33:41 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2014-11-26 16:22:43 +0100 |
commit | 421f78a65fd2f0d39612a394c7ad579195ac16da (patch) | |
tree | 3046ec317b76b310b45f172906ad65c7fd13e841 /src/platformsupport/devicediscovery/devicediscovery.pri | |
parent | a7dcc661d59851ca93f56a57131563e86d531773 (diff) |
Reorganize devicediscovery header
As pointed out in 13b939c7f41bceb2061e549923eab242326e9bb5 the approach
qdevicediscovery_p.h takes is just wrong. The defines it relies on will
often be missing when the header is included from random places in qtbase.
This results in different class layouts. It was working only because the
interface of the class is very limited and the public part was matching
regardless of having the macro defined.
This is now corrected by introducing subclasses and a common, non-variated
base class. QDEVICEDISCOVERY_UDEV is removed completely.
Change-Id: I9c83b5b041440a3a6ea3a604eee4a325d4d74439
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/platformsupport/devicediscovery/devicediscovery.pri')
-rw-r--r-- | src/platformsupport/devicediscovery/devicediscovery.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/platformsupport/devicediscovery/devicediscovery.pri b/src/platformsupport/devicediscovery/devicediscovery.pri index 9748129225..1ac25da901 100644 --- a/src/platformsupport/devicediscovery/devicediscovery.pri +++ b/src/platformsupport/devicediscovery/devicediscovery.pri @@ -3,14 +3,15 @@ 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 - # Use our own define. QT_NO_LIBUDEV may not be set on non-Linux systems. - DEFINES += QDEVICEDISCOVERY_UDEV } 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 } } else { SOURCES += $$PWD/qdevicediscovery_dummy.cpp |