Merge tag 'upstream/3.1.0'

Upstream version 3.1.0

# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 2 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.h
index ae2f3a7..f0ab1de 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.h
@@ -84,6 +84,7 @@ class GUI_API_EXPORT ConfigDialog : public QDialog
         void addDataType(const QString& typeStr);

         void rollbackPluginConfigs();

         void commitPluginConfigs();

+        void connectMapperSignals(ConfigMapper* mapper);

 

         Ui::ConfigDialog *ui = nullptr;

         QStyle* previewStyle = nullptr;

@@ -136,6 +137,7 @@ class GUI_API_EXPORT ConfigDialog : public QDialog
         void updateBuiltInPluginsVisibility();

         void applyShortcutsFilter(const QString& filter);

         void markRequiresSchemasRefresh();

+        void notifyPluginsAboutModification(QWidget*, CfgEntry* key, const QVariant& value);

 

     public slots:

         void accept();