diff --git a/obs/forms/OBSBasic.ui b/obs/forms/OBSBasic.ui index 459ad5694..42fd544ab 100644 --- a/obs/forms/OBSBasic.ui +++ b/obs/forms/OBSBasic.ui @@ -473,6 +473,18 @@ QFrame::Plain + + true + + + true + + + QAbstractItemView::InternalMove + + + Qt::IgnoreAction + diff --git a/obs/qt-wrappers.cpp b/obs/qt-wrappers.cpp index 1643c26c4..66ad29235 100644 --- a/obs/qt-wrappers.cpp +++ b/obs/qt-wrappers.cpp @@ -79,6 +79,18 @@ uint32_t TranslateQtKeyboardEventModifiers(Qt::KeyboardModifiers mods) return obsModifiers; } +QDataStream &operator<<(QDataStream &out, + const std::vector> &) +{ + return out; +} + +QDataStream &operator>>(QDataStream &in, + std::vector> &) +{ + return in; +} + QDataStream &operator<<(QDataStream &out, const OBSScene &scene) { return out << QString(obs_source_get_name(obs_scene_get_source(scene))); diff --git a/obs/qt-wrappers.hpp b/obs/qt-wrappers.hpp index e661cd03e..925ab696e 100644 --- a/obs/qt-wrappers.hpp +++ b/obs/qt-wrappers.hpp @@ -20,6 +20,9 @@ #include #include +#include +#include + #define QT_UTF8(str) QString::fromUtf8(str) #define QT_TO_UTF8(str) str.toUtf8().constData() @@ -33,6 +36,10 @@ void QTToGSWindow(WId windowId, gs_window &gswindow); uint32_t TranslateQtKeyboardEventModifiers(Qt::KeyboardModifiers mods); +QDataStream &operator<<(QDataStream &out, + const std::vector> &signal_vec); +QDataStream &operator>>(QDataStream &in, + std::vector> &signal_vec); QDataStream &operator<<(QDataStream &out, const OBSScene &scene); QDataStream &operator>>(QDataStream &in, OBSScene &scene); QDataStream &operator<<(QDataStream &out, const OBSSceneItem &si); diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index 6528eff4a..261ef71b0 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -133,6 +133,9 @@ OBSBasic::OBSBasic(QWidget *parent) qRegisterMetaType ("OBSSource"); qRegisterMetaType("obs_hotkey_id"); + qRegisterMetaTypeStreamOperators< + std::vector>>( + "std::vector>"); qRegisterMetaTypeStreamOperators("OBSScene"); qRegisterMetaTypeStreamOperators("OBSSceneItem");