Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST 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>"

1 files changed, 4 insertions, 1 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.h
index 3c828c0..4d49145 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.h
@@ -26,12 +26,15 @@ class GUI_API_EXPORT AboutDialog : public QDialog
     private:
         void init(InitialMode initialMode);
         void buildIndex();
-        void readLicense(int row, const QString& title, const QString& path);
+        void addLicense(int row, const QString& title, const QString& contents, const QString& violation);
         QString readFile(const QString& path);
 
+        static QStringList filterResourcePaths(const QStringList& paths);
+
         Ui::AboutDialog *ui = nullptr;
         QStringList indexContents;
         QString licenseContents;
+        QAction* copyAct = nullptr;
 };
 
 #endif // ABOUTDIALOG_H