Merge remote-tracking branch 'origin/4.13' into master

Change-Id: I565a0bd783dc80b53d4715fdc153dba1f1d3f7c7
2020-10-05 09:05:23 +02:00
parent 48c56416f5 2f584585e3
commit ad7dbc4619
31 changed files with 468 additions and 18 deletions
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -502,6 +502,8 @@ QGroupBox *AndroidManifestEditorWidget::createAdvancedGroupBox(QWidget *parent)
            this, &AndroidManifestEditorWidget::setInvalidServiceInfo);
    connect(m_splashButtons, &SplashIconContainerWidget::splashScreensModified,
            this, [this]() { setDirty(); });
+    connect(m_iconButtons, &AndroidManifestEditorIconContainerWidget::iconsModified,
+            this, [this]() { setDirty(); });

    formLayout->addRow(m_advanvedTabWidget);
    otherGroupBox->setLayout(formLayout);