Merge tag 'upstream/3.0.6'

Upstream version 3.0.6

# gpg: Signature made Tue 12 May 2015 04:19:45 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/multieditor/multieditor.h b/SQLiteStudio3/guiSQLiteStudio/multieditor/multieditor.h
index 2576c97..04b9af7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/multieditor/multieditor.h
+++ b/SQLiteStudio3/guiSQLiteStudio/multieditor/multieditor.h
@@ -45,6 +45,7 @@ class GUI_API_EXPORT MultiEditor : public QWidget
         void setDeletedRow(bool value);
         void setDataType(const DataType& dataType);
         void focusThisEditor();
+        void setCornerLabel(const QString& label);
 
         static void loadBuiltInEditors();
 
@@ -61,6 +62,7 @@ class GUI_API_EXPORT MultiEditor : public QWidget
         static const int margins = 2;
         static const int spacing = 2;
 
+        QLabel* cornerLabel = nullptr;
         QCheckBox* nullCheck = nullptr;
         QTabWidget* tabs = nullptr;
         QList<MultiEditorWidget*> editors;