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.cpp | |
| 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.cpp')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp index 963ba7d..8d62b44 100644 --- a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp @@ -39,7 +39,7 @@ DEFINE_SINGLETON(SQLiteStudio) -static const int sqlitestudioVersion = 30005; +static const int sqlitestudioVersion = 30006; SQLiteStudio::SQLiteStudio() { @@ -87,6 +87,7 @@ void SQLiteStudio::setImmediateQuit(bool value) immediateQuit = value; } +#ifdef PORTABLE_CONFIG UpdateManager* SQLiteStudio::getUpdateManager() const { return updateManager; @@ -96,6 +97,7 @@ void SQLiteStudio::setUpdateManager(UpdateManager* value) { updateManager = value; } +#endif BugReporter* SQLiteStudio::getBugReporter() const { @@ -319,7 +321,9 @@ void SQLiteStudio::init(const QStringList& cmdListArguments, bool guiAvailable) importManager = new ImportManager(); populateManager = new PopulateManager(); bugReporter = new BugReporter(); +#ifdef PORTABLE_CONFIG updateManager = new UpdateManager(); +#endif extraLicenseManager = new ExtraLicenseManager(); extraLicenseManager->addLicense("SQLiteStudio license (GPL v3)", ":/docs/licenses/sqlitestudio_license.txt"); @@ -349,7 +353,9 @@ void SQLiteStudio::cleanUp() pluginManager->deinit(); safe_delete(pluginManager); // PluginManager before DbManager, so Db objects are deleted while DbManager still exists +#ifdef PORTABLE_CONFIG safe_delete(updateManager); +#endif safe_delete(bugReporter); safe_delete(populateManager); safe_delete(importManager); |