diff options
author | Laszlo Papp <lpapp@kde.org> | 2013-10-29 13:07:10 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-30 14:22:07 +0100 |
commit | e2fb29e3c1462c42f11fc9f6a0ee0bb21a1eaee9 (patch) | |
tree | f2006487d41116481b5bb9697d4ad7c19cb21b58 /src/serialport | |
parent | 51fe3f4b3b1021f79bdea9f5d0d8735cbb68d9a1 (diff) | |
download | qtserialport-e2fb29e3c1462c42f11fc9f6a0ee0bb21a1eaee9.tar.gz |
Respect the configure script run for udev
Configure does not currently have an argument for udev, but still: it will try
to detect it and if it is available QT_CONFIG contains the "libudev" word.
We should respect that for Qt 5. Unfortunate, the configure script is not
checking this for Qt 4, so we still need to fall back to pkgconfig for Qt 4.
Change-Id: I9e755ee015f4f584e945cb176f1788b6dbac7374
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/serialport')
-rw-r--r-- | src/serialport/serialport-lib.pri | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/serialport/serialport-lib.pri b/src/serialport/serialport-lib.pri index f9d0af3..522f96a 100644 --- a/src/serialport/serialport-lib.pri +++ b/src/serialport/serialport-lib.pri @@ -1,11 +1,18 @@ INCLUDEPATH += $$PWD !contains(DEFINES, LOAD_LIBUDEV): unix { - CONFIG += link_pkgconfig - - packagesExist(libudev) { - DEFINES += LINK_LIBUDEV - PKGCONFIG += libudev + greaterThan(QT_MAJOR_VERSION, 4) { + contains(QT_CONFIG, libudev) { + DEFINES += LINK_LIBUDEV + INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV + LIBS += $$QMAKE_LIBS_LIBUDEV + } + } else { + packagesExist(libudev) { + CONFIG += link_pkgconfig + DEFINES += LINK_LIBUDEV + PKGCONFIG += libudev + } } } |