modules/gui/qt/dialogs/toolbar/controlbar_profile.cpp

@@ -17,6 +17,8 @@
  *****************************************************************************/
 #include "controlbar_profile.hpp"
 
+#include <QMetaMethod>
+
 #include "player/control_list_model.hpp"
 #include "player/player_controlbar_model.hpp"
 
@@ -198,7 +200,7 @@ void ControlbarProfile::generateLinearControlList()
         return;
 
     // Don't bother if there is no receiver (connection):
-    if (receivers(SIGNAL(controlListChanged (const QVector<int>&) )) <= 0)
+    if (! isSignalConnected(QMetaMethod::fromSignal(&ControlbarProfile::controlListChanged)) )
         return;
 
     QVector<int> linearControls;

modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp

@@ -208,11 +208,14 @@ ControlbarProfileModel::ControlbarProfileModel(qt_intf_t *p_intf, QObject *paren
             insertDefaults();
     });
 
-    if (reload() == false)
-    {
-        // If initial reload fails, load the default profiles:
-        insertDefaults();
-    }
+    // defer initialization reload:
+    QMetaObject::invokeMethod(this, [this] () {
+        if (reload() == false)
+        {
+            // If initial reload fails, load the default profiles:
+            insertDefaults();
+        }
+    }, Qt::QueuedConnection);
 }
 
 void ControlbarProfileModel::insertDefaults()

modules/gui/qt/maininterface/mainui.cpp

@@ -244,8 +244,7 @@ void MainUI::registerQMLTypes()
 
     qmlRegisterType<QmlEventFilter>( "org.videolan.vlc", 0, 1, "EventFilter" );
 
-    qRegisterMetaType<ControlbarProfile*>();
-    qRegisterMetaType<ControlbarProfileModel*>();
+    qmlRegisterUncreatableType<ControlbarProfileModel>("org.videolan.vlc", 0, 1, "ControlbarProfileModel", "");
     qmlRegisterUncreatableType<ControlbarProfile>("org.videolan.vlc", 0, 1, "ControlbarProfile", "");
     qmlRegisterUncreatableType<PlayerControlbarModel>("org.videolan.vlc", 0, 1, "PlayerControlbarModel", "");
     qmlRegisterUncreatableType<ControlListModel>( "org.videolan.vlc", 0, 1, "ControlListModel", "" );