diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-01-23 12:48:57 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-03-10 14:16:17 +0000 |
| commit | 38d031cd33db6f3790024d92e72a6356e80fd53d (patch) | |
| tree | 6fa542f89ba915b53ec8403548e3c2ba018d9368 /tests | |
| parent | f6a95c982936b353dc76e61ecd601746497e238a (diff) | |
Use libusb from env variable LIBUSB_PATH on Windows
Some places were setting directly the contents of LIBS, which overwrote
the libusb configuration, so instead append in those places. (And all
the other places for consistency.)
Change-Id: I8177a863a8b866f3e19fb5207e73082ea86352c5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/servicetest.pro | 12 | ||||
| -rw-r--r-- | tests/streamtest.pro | 12 | ||||
| -rw-r--r-- | tests/tst_stream.pro | 4 |
3 files changed, 8 insertions, 20 deletions
diff --git a/tests/servicetest.pro b/tests/servicetest.pro index ac95228..8b59f79 100644 --- a/tests/servicetest.pro +++ b/tests/servicetest.pro @@ -6,13 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app -unix { - CONFIG += link_pkgconfig - PKGCONFIG += libusb-1.0 -} -win32 { - LIBS += -llibusb-1.0 -} +include($$PWD/../libusb_setup.pri) HEADERS += \ ../qdb/server/connection.h \ @@ -38,7 +32,7 @@ SOURCES += \ INCLUDEPATH += $$PWD/../ unix { - LIBS = -L$$OUT_PWD/../libqdb -lqdb + LIBS += -L$$OUT_PWD/../libqdb -lqdb QMAKE_RPATHDIR += ../libqdb } @@ -63,5 +57,5 @@ win32 { } else { LIBQDBDIR = $$OUT_PWD/../libqdb/release } - LIBS = -L$$LIBQDBDIR -lqdb + LIBS += -L$$LIBQDBDIR -lqdb } diff --git a/tests/streamtest.pro b/tests/streamtest.pro index 09cff3a..793d4e9 100644 --- a/tests/streamtest.pro +++ b/tests/streamtest.pro @@ -6,13 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app -unix { - CONFIG += link_pkgconfig - PKGCONFIG += libusb-1.0 -} -win32 { - LIBS += -llibusb-1.0 -} +include($$PWD/../libusb_setup.pri) HEADERS += \ ../qdb/server/usb-host/usbcommon.h \ @@ -32,7 +26,7 @@ SOURCES += \ INCLUDEPATH += $$PWD/../ unix { - LIBS = -L$$OUT_PWD/../libqdb -lqdb + LIBS += -L$$OUT_PWD/../libqdb -lqdb QMAKE_RPATHDIR += ../libqdb } @@ -50,5 +44,5 @@ win32 { } else { LIBQDBDIR = $$OUT_PWD/../libqdb/release } - LIBS = -L$$LIBQDBDIR -lqdb + LIBS += -L$$LIBQDBDIR -lqdb } diff --git a/tests/tst_stream.pro b/tests/tst_stream.pro index 8cde9f5..b78ad71 100644 --- a/tests/tst_stream.pro +++ b/tests/tst_stream.pro @@ -15,7 +15,7 @@ SOURCES += \ INCLUDEPATH += $$PWD/../ unix { - LIBS = -L$$OUT_PWD/../libqdb -lqdb + LIBS += -L$$OUT_PWD/../libqdb -lqdb QMAKE_RPATHDIR += ../libqdb } @@ -40,6 +40,6 @@ win32 { LIBQDBDIR = $$OUT_PWD/../libqdb/release } - LIBS = -L$$LIBQDBDIR -lqdb + LIBS += -L$$LIBQDBDIR -lqdb } |