Merge branch 'property_update' of https://github.com/openpnp/openpnp-capture into property_update

trcwm · trcwm · commit 07a525c3a866 · 2018-02-21T17:35:38.000+01:00
diff --git a/QtCaptureTest/QtCaptureTest.pro b/QtCaptureTest/QtCaptureTest.pro
@@ -26,5 +26,12 @@ FORMS    += mainwindow.ui
 
 LIBS += -L../build/ -lopenpnp-capture
 
+# add nvidia to library search path
+# your linux installation will probably have
+# a different location...
+linux {
+    LIBS += -L/usr/lib/nvidia-304/
+}
+
 # add run-path relative dylib search path
 QMAKE_RPATHDIR += .
diff --git a/QtCaptureTest/mainwindow.h b/QtCaptureTest/mainwindow.h
@@ -6,6 +6,7 @@
 #include <QLabel>
 #include <QCheckBox>
 #include <QSlider>
+#include <QMutex>
 #include <vector>
 #include "openpnp-capture.h"
 
