Manual Merge Cleanup

build_scripts/qt/resources.pri

@@ -18,6 +18,12 @@ DISTFILES += \
     src/res/qml/ChaperoneWarningsPage.qml \
     src/res/qml/FixFloorPage.qml \
     src/res/qml/PlayspacePage.qml \
+    src/res/qml/motion_page/* \
+    src/res/qml/motion_page/gravity/* \
+    src/res/qml/motion_page/height_toggle/* \
+    src/res/qml/motion_page/snap_turn/* \
+    src/res/qml/motion_page/universe_drag/* \
+    src/res/qml/motion_page/universe_turn/* \
     src/res/qml/RevivePage.qml \
     src/res/qml/RootPage.qml \
     src/res/qml/SettingsPage.qml \

build_scripts/qt/sources.pri

@@ -31,6 +31,7 @@ HEADERS += src/overlaycontroller.h \
     src/tabcontrollers/KeyboardInput.h \
     src/utils/Matrix.h \
     src/utils/ChaperoneUtils.h \
+    src/utils/quaternion.h \
     src/tabcontrollers/audiomanager/AudioManagerDummy.h \
     src/tabcontrollers/keyboardinput/KeyboardInputDummy.h \
     src/overlaycontroller/openvr_init.h \