Merge remote-tracking branch 'upstream/devel' into devel

app/dialog/ConfigureFormatDialog.cpp

@@ -173,12 +173,18 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
 
   QFont titleFont, menusFont, normalFont;
 
+#if QT_VERSION > QT_VERSION_CHECK( 6, 0, 0 )
+  auto fontWeight = QFont::Weight::Bold;
+#else
+  auto fontWeight = 75;
+#endif
+
   titleFont.setPointSize( 12 );
   titleFont.setBold( true );
-  titleFont.setWeight( 75 );
+  titleFont.setWeight( fontWeight );
 
   menusFont.setBold( true );
-  titleFont.setWeight( 75 );
+  titleFont.setWeight( fontWeight );
 
   normalFont.setBold( false );
   // menusFont.setPointSize( 12 );
@@ -402,8 +408,8 @@ auto findPelFormatColorSpace( ClpPixelFormats rInputFormat ) -> std::pair<int, s
 
 auto ConfigureFormatDialog::runConfigureFormatDialog( const QString& Filename, unsigned int& rWidth,
                                                       unsigned int& rHeight, ClpPixelFormats& rInputFormat,
-                                                      unsigned int& rBits, int& rEndianess, unsigned int& rFrameRate )
-    -> QDialog::DialogCode
+                                                      unsigned int& rBits, int& rEndianess,
+                                                      unsigned int& rFrameRate ) -> QDialog::DialogCode
 {
   // Set default values
   // setWindowTitle( "Configure resolution for " + Filename );
@@ -504,8 +510,7 @@ void ConfigureFormatDialog::slotResolutionChange()
 
 void ConfigureFormatDialog::slotColorSpaceChange( int idx )
 {
-  if( idx == -1 )
-    return;
+  if( idx == -1 ) return;
 
   m_comboBoxPixelFormat->clear();
   const auto& formats_list = CalypFrame::supportedPixelFormatListNames( idx );
@@ -539,6 +544,6 @@ void ConfigureFormatDialog::writeSettings()
 {
   QSettings appSettings;
   QVariant var;
-  var.setValue<CalypStandardResolutionVector>( aRCustomFileFormats );
+  var.setValue( aRCustomFileFormats );
   appSettings.setValue( "ConfigureFormatDialog/CustomFormats", var );
 }