to rebasefeature/qt6

2 files changed, 5 insertions, 5 deletions

diff --git a/tracker-steamvr/steamvr.cpp b/tracker-steamvr/steamvr.cpp
index 3bcfcc25..eafbb946 100644
--- a/tracker-steamvr/steamvr.cpp
+++ b/tracker-steamvr/steamvr.cpp
@@ -26,7 +26,7 @@
 #include <QMessageBox>
 #include <QDebug>
 
-QMutex device_list::mtx(QMutex::Recursive);
+QRecursiveMutex device_list::mtx;
 
 template<typename F>
 auto with_vr_lock(F&& fun) -> decltype(fun(vr_t(), vr_error_t()))
@@ -285,7 +285,7 @@ steamvr_dialog::steamvr_dialog()
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 
     ui.device->clear();
-    ui.device->addItem("First available", QVariant(QVariant::String));
+    ui.device->addItem("First available", QString{});
 
     device_list list;
     for (const device_spec& spec : list.devices())
diff --git a/tracker-steamvr/steamvr.hpp b/tracker-steamvr/steamvr.hpp
index 61da2e05..2e9c5391 100644
--- a/tracker-steamvr/steamvr.hpp
+++ b/tracker-steamvr/steamvr.hpp
@@ -8,7 +8,7 @@
 #include <climits>
 
 #include <QString>
-#include <QMutex>
+#include <QRecursiveMutex>
 #include <QList>
 
 #include <openvr.h>
@@ -27,7 +27,7 @@ struct settings : opts
     value<QVariant> device_serial;
     settings() :
         opts("valve-steamvr"),
-        device_serial(b, "serial", QVariant(QVariant::String))
+        device_serial(b, "serial", QString{})
     {}
 };
 
@@ -57,7 +57,7 @@ struct device_list final
 
 private:
     QList<device_spec> device_specs;
-    static QMutex mtx;
+    static QRecursiveMutex mtx;
     static tt vr_init_();
     static void fill_device_specs(QList<device_spec>& list);
     static tt vr_init();