etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-12-28 18:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

ui/obs-browser-widget: Switch header order to fix Qt AutoMoc bug

Browse source 
Qt's CMake integration does not pass the C++ standard to AutoMoc, resulting in weird parsing issues (see https://bugreports.qt.io/browse/QTBUG-73263).
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-03-10 20:22:48 +01:00
parent db23069eb6
commit 0fa12f1029
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/ui/ui-obs-browser-widget.cpp
View file

@ -3,9 +3,11 @@
// AUTOGENERATED COPYRIGHT HEADER END // AUTOGENERATED COPYRIGHT HEADER END
#include "ui-obs-browser-widget.hpp" #include "ui-obs-browser-widget.hpp"
#include "plugin.hpp"
#include "warning-disable.hpp" #include "warning-disable.hpp"
#include <QGridLayout>
#include <QLabel>
#include "../third-party/obs-studio/plugins/obs-browser/panel/browser-panel.hpp" #include "../third-party/obs-studio/plugins/obs-browser/panel/browser-panel.hpp"
#include <mutex> #include <mutex>
@ -14,11 +16,10 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#include <QGridLayout>
#include <QLabel>
#include "warning-enable.hpp" #include "warning-enable.hpp"
#include "plugin.hpp"
streamfx::ui::obs_browser_cef::obs_browser_cef() streamfx::ui::obs_browser_cef::obs_browser_cef()
{ {
// Load the "obs-browser" module. // Load the "obs-browser" module.

8
source/ui/ui-obs-browser-widget.hpp
View file

@ -3,15 +3,15 @@
// AUTOGENERATED COPYRIGHT HEADER END // AUTOGENERATED COPYRIGHT HEADER END
#pragma once #pragma once
#include "util/util-library.hpp"
#include "warning-disable.hpp" #include "warning-disable.hpp"
#include <memory>
#include <QUrl> #include <QUrl>
#include <QWidget> #include <QWidget>
#include <memory>
#include "warning-enable.hpp" #include "warning-enable.hpp"
#include "util/util-library.hpp"
namespace streamfx::ui { namespace streamfx::ui {
class obs_browser_cef { class obs_browser_cef {
std::shared_ptr<::streamfx::util::library> _module; std::shared_ptr<::streamfx::util::library> _module;