mirror/obs-studio
1
0 Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-20 13:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3050 from jpark37/qt-warnings-515

Browse Source 
UI: Fix warnings for Qt 5.15
This commit is contained in:
Jim authored and GitHub committed 2020-07-10 15:30:26 -07:00
2 parents 87915489b4 c2ddc428b0
commit 6347a221a0
10 files changed
+46 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/window-basic-main.cpp
+9 -3
View File
@@ -221,7 +221,9 @@ OBSBasic::OBSBasic(QWidget *parent)
statsDock = new OBSDock();
statsDock->setObjectName(QStringLiteral("statsDock"));
statsDock->setFeatures(QDockWidget::AllDockWidgetFeatures);
statsDock->setFeatures(QDockWidget::DockWidgetClosable |
QDockWidget::DockWidgetMovable |
QDockWidget::DockWidgetFloatable);
statsDock->setWindowTitle(QTStr("Basic.Stats"));
addDockWidget(Qt::BottomDockWidgetArea, statsDock);
statsDock->setVisible(false);
@@ -7144,7 +7146,9 @@ void OBSBasic::on_lockUI_toggled(bool lock)
{
QDockWidget::DockWidgetFeatures features =
lock ? QDockWidget::NoDockWidgetFeatures
: QDockWidget::AllDockWidgetFeatures;
: (QDockWidget::DockWidgetClosable |
QDockWidget::DockWidgetMovable |
QDockWidget::DockWidgetFloatable);
QDockWidget::DockWidgetFeatures mainFeatures = features;
mainFeatures &= ~QDockWidget::QDockWidget::DockWidgetClosable;
@@ -7814,7 +7818,9 @@ QAction *OBSBasic::AddDockWidget(QDockWidget *dock)
bool lock = ui->lockUI->isChecked();
QDockWidget::DockWidgetFeatures features =
lock ? QDockWidget::NoDockWidgetFeatures
: QDockWidget::AllDockWidgetFeatures;
: (QDockWidget::DockWidgetClosable |
QDockWidget::DockWidgetMovable |
QDockWidget::DockWidgetFloatable);
dock->setFeatures(features);