Merge remote-tracking branch 'upstream/master'

Author: Niels Moseley

.gitignore

@@ -5,4 +5,5 @@ java/target
 mac/openpnp-capture.xcodeproj/xcuserdata
 mac/openpnp-capture.xcodeproj/project.xcworkspace/xcuserdata
 common/version.h
-build
+/build*
+*.pro.user

mac/QtCaptureTest/QtCaptureTest.pro renamed to QtCaptureTest/QtCaptureTest.pro

@@ -11,12 +11,11 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = QtCaptureTest
 TEMPLATE = app
 
-#CONFIG += app_bundle
-CONFIG -= app_bundle
-CONFIG += console
+macx:CONFIG -= app_bundle
+#CONFIG += console
 
 # add the openpnp-capture include path
-INCLUDEPATH += ../../include
+INCLUDEPATH += ../include
 
 SOURCES += main.cpp\
         mainwindow.cpp
@@ -25,7 +24,7 @@ HEADERS  += mainwindow.h
 
 FORMS    += mainwindow.ui
 
-LIBS += -L"../../build/" -lopenpnp-capture
+LIBS += -L../build/ -lopenpnp-capture
 
 # add run-path relative dylib search path
 QMAKE_RPATHDIR += .