diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2021-07-29 15:55:09 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2021-07-29 15:55:09 +0200 |
commit | eded65bbcabd8e2267ef3a1d7df467ab403b27e0 (patch) | |
tree | e8352bd3fdaa3ae582880945938d6eef21ffc480 /tracker-steamvr/steamvr.cpp | |
parent | 2112db0a98a2cd14b25828a5bc84bddc423712bf (diff) |
to rebasefeature/qt6
Diffstat (limited to 'tracker-steamvr/steamvr.cpp')
-rw-r--r-- | tracker-steamvr/steamvr.cpp | 4 |
1 files changed, 2 insertions, 2 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()) |