Merge branch 'fix-build-videoformat' into 'master'

Fix compilation error on Setting constructor See merge request mattbas/glaxnimate!7
mbasaglia · Jan 15, 2022 · 2610b3d · 2610b3d
2 parents bf7d329 + f90a372
commit 2610b3d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/core/io/video/video_format.cpp b/src/core/io/video/video_format.cpp
@@ -816,7 +816,7 @@ std::unique_ptr<app::settings::SettingsGroup> glaxnimate::io::video::VideoFormat
     return std::make_unique<app::settings::SettingsGroup>(app::settings::SettingList{
         //                      slug            label           description                                         default min max
         app::settings::Setting{"bit_rate",   tr("Bitrate"),      tr("Video bit rate"),                               5000,   0, 10000},
-        app::settings::Setting{"background", tr("Background"),   tr("Background color"),                             QColor(0, 0, 0, 0))},
+        app::settings::Setting{"background", tr("Background"),   tr("Background color"),                             QColor(0, 0, 0, 0)},
         app::settings::Setting{"width",      tr("Width"),        tr("If not 0, it will overwrite the size"),         document->main()->width.get(), 0, 10000},
         app::settings::Setting{"height",     tr("Height"),       tr("If not 0, it will overwrite the size"),         document->main()->height.get(),0, 10000},
         app::settings::Setting{"verbose",    tr("Verbose"),      tr("Show verbose information on the conversion"),   false},