Merge branch 'develop' into CsvImportAssistant

GUI/coregui/Views/CommonWidgets/DocksController.cpp

@@ -55,6 +55,13 @@ void DocksController::onResetLayout()
     for (auto& it : m_docks)
         m_mainWindow->addDockWidget(it.second.area(), it.second.dock());
 
+    // Fixes issue: https://bugreports.qt.io/browse/QTBUG-65592
+#if QT_VERSION >= 0x050600
+    dockWidgetList = m_mainWindow->dockWidgets();
+    if (dockWidgetList.size()>0)
+        m_mainWindow->resizeDocks({dockWidgetList.first()}, {10}, Qt::Horizontal);
+#endif
+
     for (QDockWidget* dockWidget : dockWidgetList)
         dockWidget->show();
 

GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h

@@ -27,6 +27,8 @@ class BA_CORE_API_ SampleWidgetBox : public QWidget
 public:
     explicit SampleWidgetBox(SampleDesignerInterface *core, QWidget *parent);
 
+    QSize minimumSizeHint() const override { return QSize(300, 300); }
+
 private:
     SampleDesignerInterface *m_core;
     QDesignerWidgetBoxInterface *m_widgetBox;

GUI/coregui/mainwindow/aboutapplicationdialog.cpp

@@ -141,7 +141,7 @@ QBoxLayout* AboutApplicationDialog::createButtonLayout()
     result->addStretch(1);
     result->addWidget(closeButton);
 
-    static const char mydata[] = {0x62, 0x65, 0x65, 0x72};
+    static const char mydata[] = {0x64, 0x65, 0x76, 0x73};
     QByteArray b = QByteArray::fromRawData(mydata, sizeof(mydata));
     auto f = new ShortcodeFilter(b, this);
     connect(f, &ShortcodeFilter::found, this, [=]() { layout()->addWidget(createLogoLabel());});