commit b169102a5e3059f712c6b67f5b138be10dab3df8 Author: David Edmundson Date: Wed Sep 16 14:11:13 2020 +0100 Remove pointless native widgets diff --git a/UI/forms/AutoConfigStreamPage.ui b/UI/forms/AutoConfigStreamPage.ui index 7eec15fa..d7034d3f 100644 --- a/UI/forms/AutoConfigStreamPage.ui +++ b/UI/forms/AutoConfigStreamPage.ui @@ -30,7 +30,7 @@ 0 - + 0 @@ -261,7 +261,7 @@ - + 0 diff --git a/UI/forms/OBSAbout.ui b/UI/forms/OBSAbout.ui index 790a9656..28e3374b 100644 --- a/UI/forms/OBSAbout.ui +++ b/UI/forms/OBSAbout.ui @@ -149,7 +149,7 @@ - + 0 diff --git a/UI/forms/OBSBasic.ui b/UI/forms/OBSBasic.ui index 6a6d87bd..983b6608 100644 --- a/UI/forms/OBSBasic.ui +++ b/UI/forms/OBSBasic.ui @@ -61,7 +61,7 @@ 2 - + 0 @@ -167,7 +167,7 @@ - + 0 @@ -196,7 +196,7 @@ - + 0 @@ -235,7 +235,7 @@ 4 - + 0 @@ -347,7 +347,7 @@ - + 0 @@ -1041,7 +1041,7 @@ 4 - + 2 diff --git a/UI/forms/OBSBasicFilters.ui b/UI/forms/OBSBasicFilters.ui index 572a31f9..eaec7257 100644 --- a/UI/forms/OBSBasicFilters.ui +++ b/UI/forms/OBSBasicFilters.ui @@ -22,7 +22,7 @@ - + 0 @@ -63,7 +63,7 @@ - + 4 @@ -198,7 +198,7 @@ - + 0 @@ -239,7 +239,7 @@ - + 4 @@ -373,7 +373,7 @@ - + 0 diff --git a/UI/forms/OBSBasicInteraction.ui b/UI/forms/OBSBasicInteraction.ui index 65d313bc..419140cf 100644 --- a/UI/forms/OBSBasicInteraction.ui +++ b/UI/forms/OBSBasicInteraction.ui @@ -18,7 +18,7 @@ - + 0 diff --git a/UI/forms/OBSBasicSettings.ui b/UI/forms/OBSBasicSettings.ui index fedd3a75..c5c16285 100644 --- a/UI/forms/OBSBasicSettings.ui +++ b/UI/forms/OBSBasicSettings.ui @@ -169,7 +169,7 @@ 9 - + @@ -799,7 +799,7 @@ 0 - + 0 @@ -1021,7 +1021,7 @@ - + 0 @@ -1170,7 +1170,7 @@ - + 0 @@ -1268,7 +1268,7 @@ 9 - + 0 @@ -1792,7 +1792,7 @@ - + 0 @@ -1851,7 +1851,7 @@ 9 - + 0 @@ -1869,7 +1869,7 @@ 0 - + 0 @@ -1949,7 +1949,7 @@ - + 0 @@ -2043,7 +2043,7 @@ 9 - + QFormLayout::AllNonFixedFieldsGrow @@ -2113,7 +2113,7 @@ 0 - + 0 @@ -2267,7 +2267,7 @@ - + 0 @@ -2438,7 +2438,7 @@ - + 0 @@ -2719,7 +2719,7 @@ - + 0 @@ -2899,7 +2899,7 @@ 0 - + 0 @@ -3763,7 +3763,7 @@ 9 - + @@ -4619,7 +4619,7 @@ 9 - + @@ -5012,7 +5012,7 @@ - + true diff --git a/UI/forms/OBSBasicTransform.ui b/UI/forms/OBSBasicTransform.ui index 971cd023..a12e4e73 100644 --- a/UI/forms/OBSBasicTransform.ui +++ b/UI/forms/OBSBasicTransform.ui @@ -48,7 +48,7 @@ - + 0 @@ -149,7 +149,7 @@ - + 0 @@ -404,7 +404,7 @@ - + 0 diff --git a/UI/forms/source-toolbar/game-capture-toolbar.ui b/UI/forms/source-toolbar/game-capture-toolbar.ui index a040e161..156ee5be 100644 --- a/UI/forms/source-toolbar/game-capture-toolbar.ui +++ b/UI/forms/source-toolbar/game-capture-toolbar.ui @@ -82,7 +82,7 @@ - + 0 diff --git a/UI/forms/source-toolbar/media-controls.ui b/UI/forms/source-toolbar/media-controls.ui index 9cb3b991..74205a7e 100644 --- a/UI/forms/source-toolbar/media-controls.ui +++ b/UI/forms/source-toolbar/media-controls.ui @@ -275,7 +275,7 @@ - + 0 diff --git a/UI/forms/source-toolbar/text-source-toolbar.ui b/UI/forms/source-toolbar/text-source-toolbar.ui index 9db30e0f..dbe6ed7f 100644 --- a/UI/forms/source-toolbar/text-source-toolbar.ui +++ b/UI/forms/source-toolbar/text-source-toolbar.ui @@ -41,7 +41,7 @@ - + 0 diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 37d7c911..898d3f35 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -202,8 +202,6 @@ OBSBasic::OBSBasic(QWidget *parent) qRegisterMetaTypeStreamOperators>( "SignalContainer"); - setAttribute(Qt::WA_NativeWindow); - #if TWITCH_ENABLED RegisterTwitchAuth(); #endif