diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-06 13:09:57 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-06 12:39:18 +0000 |
| commit | 6803fbb01566e74df895326fb7805868696ce9c4 (patch) | |
| tree | 98eb1975ef46023cacb80e495f3c34063d10de56 | |
| parent | b63a833346ed14baddbf598d48e005090b8bcb56 (diff) | |
Fix build with -no-feature-library
Drop an unused include, don't try to set the library path if
!QT_CONFIG(library) and don't build the peakcan and tinycan plugins
as those use QLibrary to look up their symbols.
Change-Id: Id8b1245c1cf69f7548e050d47d5956f53562477d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/plugins/canbus/canbus.pro | 5 | ||||
| -rw-r--r-- | src/serialbus/qcanbus.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qcanbus/tst_qcanbus.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/canbus/canbus.pro b/src/plugins/canbus/canbus.pro index 0304dcc..09ecb0b 100644 --- a/src/plugins/canbus/canbus.pro +++ b/src/plugins/canbus/canbus.pro @@ -6,5 +6,8 @@ qtConfig(socketcan) { SUBDIRS += socketcan } -SUBDIRS += peakcan tinycan +qtConfig(library) { + SUBDIRS += peakcan tinycan +} + win32:SUBDIRS += vectorcan diff --git a/src/serialbus/qcanbus.cpp b/src/serialbus/qcanbus.cpp index ac58e8e..f143779 100644 --- a/src/serialbus/qcanbus.cpp +++ b/src/serialbus/qcanbus.cpp @@ -45,7 +45,6 @@ #include <QtCore/qlist.h> #include <private/qfactoryloader_p.h> -#include <private/qlibrary_p.h> #define QCanBusFactory_iid "org.qt-project.Qt.QCanBusFactory" diff --git a/tests/auto/qcanbus/tst_qcanbus.cpp b/tests/auto/qcanbus/tst_qcanbus.cpp index 60153e5..845b0c8 100644 --- a/tests/auto/qcanbus/tst_qcanbus.cpp +++ b/tests/auto/qcanbus/tst_qcanbus.cpp @@ -60,6 +60,7 @@ tst_QCanBus::tst_QCanBus() void tst_QCanBus::initTestCase() { +#if QT_CONFIG(library) /* * Set custom path since CI doesn't install test plugins */ @@ -69,6 +70,7 @@ void tst_QCanBus::initTestCase() QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + QStringLiteral("/../../../../plugins")); #endif +#endif // QT_CONFIG(library) bus = QCanBus::instance(); QVERIFY(bus); QCanBus *sameInstance = QCanBus::instance(); |