diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-01-30 17:00:24 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-01-30 17:00:24 -0500 |
| commit | e4767514ed04e6a0bddf3f4a47f5f0b09e65e0ee (patch) | |
| tree | 86cadc2137831d44fa29fd40a2964f7fb1326de4 /SQLiteStudio3/guiSQLiteStudio/iconmanager.h | |
| parent | 26ddfe11c2b7fac52e5f57dcd9f5223a50b2a9a7 (diff) | |
| parent | 016003905ca0e8e459e3dc33e786beda8ec92f45 (diff) | |
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>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/iconmanager.h')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/iconmanager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h index 8cb7dbe..8a30d99 100644 --- a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h +++ b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h @@ -153,6 +153,7 @@ class GUI_API_EXPORT IconManager : public QObject DEF_ICON(RELOAD, "reload") DEF_ICON(RENAME_FN_ARG, "rename_fn_arg") DEF_ICO3(RENAME_DATATYPE, RENAME_FN_ARG) + DEF_ICON(RESET_AUTOINCREMENT, "reset_autoincrement") DEF_ICON(RESULTS_BELOW, "results_below") DEF_ICON(RESULTS_IN_TAB, "results_in_tab") DEF_ICON(ROLLBACK, "rollback") @@ -244,6 +245,7 @@ class GUI_API_EXPORT IconManager : public QObject QMovie* getMovie(const QString& name); QIcon* getIcon(const QString& name); void init(); + QStringList getIconDirs() const; private: IconManager(); |