merged master to brightness

build_scripts/qt/sources.pri

@@ -13,11 +13,11 @@ SOURCES += src/main.cpp\
 	src/tabcontrollers/VideoTabController.cpp \
     src/utils/ChaperoneUtils.cpp \
     src/tabcontrollers/audiomanager/AudioManagerDummy.cpp \
-    src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp \
     src/openvr/openvr_init.cpp \
     src/openvr/ivrinput.cpp \
     src/utils/setup.cpp \
-    src/utils/paths.cpp
+    src/utils/paths.cpp \
+    src/openvr/overlay_utils.cpp
 
 HEADERS += src/overlaycontroller.h \
     src/tabcontrollers/AudioTabController.h \
@@ -32,12 +32,11 @@ HEADERS += src/overlaycontroller.h \
 	src/tabcontrollers/VideoTabController.h \
     src/tabcontrollers/AudioManager.h \
     src/tabcontrollers/PttController.h \
-    src/tabcontrollers/KeyboardInput.h \
+    src/tabcontrollers/keyboardinput/KeyboardInput.h \
     src/utils/Matrix.h \
     src/utils/ChaperoneUtils.h \
     src/quaternion/quaternion.h \
     src/tabcontrollers/audiomanager/AudioManagerDummy.h \
-    src/tabcontrollers/keyboardinput/KeyboardInputDummy.h \
     src/openvr/openvr_init.h \
     src/openvr/ivrinput_action.h \
     src/openvr/ivrinput_manifest.h \
@@ -45,13 +44,17 @@ HEADERS += src/overlaycontroller.h \
     src/openvr/ivrinput_input_source.h \
     src/openvr/ivrinput.h \
     src/utils/setup.h \
-    src/utils/paths.h
+    src/utils/paths.h \
+    src/openvr/overlay_utils.h
 
 win32 {
     SOURCES += src/tabcontrollers/audiomanager/AudioManagerWindows.cpp \
         src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
-    HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h \
-        src/tabcontrollers/keyboardinput/KeyboardInputWindows.h
+    HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h
+}
+
+!win32 {
+    SOURCES += src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp
 }
 
 win32-msvc {