From eded65bbcabd8e2267ef3a1d7df467ab403b27e0 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 29 Jul 2021 15:55:09 +0200
Subject: to rebase

---
 tracker-steamvr/steamvr.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tracker-steamvr/steamvr.cpp')

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())
-- 
cgit v1.2.3