2015-12-19 23:20:27 +01:00
|
|
|
From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
|
2015-02-21 17:54:12 +01:00
|
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
2015-12-19 23:20:27 +01:00
|
|
|
Date: Sun, 23 Aug 2015 09:16:02 -0500
|
|
|
|
Subject: [PATCH] dlopen serialport udev
|
2015-02-21 17:54:12 +01:00
|
|
|
|
|
|
|
---
|
2015-12-19 23:20:27 +01:00
|
|
|
src/serialport/qtudev_p.h | 4 ++--
|
2015-02-21 17:54:12 +01:00
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
2015-12-19 23:20:27 +01:00
|
|
|
diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
|
|
|
|
index 6f2cabd..81b9849 100644
|
|
|
|
--- a/src/serialport/qtudev_p.h
|
|
|
|
+++ b/src/serialport/qtudev_p.h
|
|
|
|
@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
|
2015-02-21 17:54:12 +01:00
|
|
|
inline bool resolveSymbols(QLibrary *udevLibrary)
|
|
|
|
{
|
|
|
|
if (!udevLibrary->isLoaded()) {
|
|
|
|
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
|
2015-10-11 18:46:55 +02:00
|
|
|
+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
|
2015-02-21 17:54:12 +01:00
|
|
|
if (!udevLibrary->load()) {
|
|
|
|
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
|
2015-10-11 18:46:55 +02:00
|
|
|
+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
|
2015-02-21 17:54:12 +01:00
|
|
|
if (!udevLibrary->load()) {
|
|
|
|
qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
|
|
|
|
return false;
|
|
|
|
--
|
2015-12-19 23:20:27 +01:00
|
|
|
2.5.0
|
2015-02-21 17:54:12 +01:00
|
|
|
|