summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2017-05-08 14:50:27 +0300
committerKari Oikarinen <kari.oikarinen@qt.io>2017-05-11 06:12:24 +0000
commit9aa1318df1f042970f12f74fcf5f59fe14b40781 (patch)
tree2e39ff0eeb03f6d9f54a73088c31b41fd3d408f7
parent430e26a747c1df605d1f6b55f4a7f7125d100dca (diff)
Revert "Skip building parts depending on libusb if it is not found"
This reverts commit 9147ebaf86cf3688066f538c407a5785f8d4200a. That commit was a workaround for missing provisioning in Coin and no longer necessary. Change-Id: I1ae1f3215f2e714d43ffe872d84973a09a1bd787 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--qdb.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/qdb.pro b/qdb.pro
index 0ce4dab..d93eaf8 100644
--- a/qdb.pro
+++ b/qdb.pro
@@ -1,5 +1,5 @@
load(configure)
-!daemon_only:!qtCompileTest(libusb10): warning("Could not find libusb-1.0, which is mandatory for host parts of QDB")
+!daemon_only:!qtCompileTest(libusb10): error("Could not find libusb-1.0, which is mandatory for host parts of QDB")
load(qt_parts)
@@ -8,7 +8,7 @@ CONFIG -= qt_example_installs
SUBDIRS += libqdb
sub_tests.depends += libqdb
-!daemon_only:config_libusb10 {
+!daemon_only {
SUBDIRS += qdb
qdb.depends += libqdb