diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
| commit | 6ce5ee411d1e6093b68b1b4eca5dc6c12b927a96 (patch) | |
| tree | 1a98416041b39765c1c42ffbeab6da9fd40e181b /SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h | |
| parent | 1fc9d1a4a1af320e39810cee21bed1201e2bddfd (diff) | |
| parent | 9618f0ebbf4b88045247c01ce8c8f58203508ebf (diff) | |
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>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h index f338e92..0b58b17 100644 --- a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h +++ b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.h @@ -25,7 +25,9 @@ class ImportManager; class PopulateManager; class PluginLoadingHandler; class BugReporter; +#ifdef PORTABLE_CONFIG class UpdateManager; +#endif class ExtraLicenseManager; /** @file */ @@ -138,8 +140,10 @@ class API_EXPORT SQLiteStudio : public QObject QString getUserManualPage() const; QString getSqliteDocsPage() const; +#ifdef PORTABLE_CONFIG UpdateManager* getUpdateManager() const; void setUpdateManager(UpdateManager* value); +#endif bool getImmediateQuit() const; void setImmediateQuit(bool value); @@ -200,7 +204,9 @@ class API_EXPORT SQLiteStudio : public QObject ImportManager* importManager = nullptr; PopulateManager* populateManager = nullptr; BugReporter* bugReporter = nullptr; +#ifdef PORTABLE_CONFIG UpdateManager* updateManager = nullptr; +#endif ExtraLicenseManager* extraLicenseManager = nullptr; QString currentLang; QStringList initialTranslationFiles; |