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, 5 insertions, 0 deletions

diff --git a/SQLiteStudio3/sqlitestudio/main.cpp b/SQLiteStudio3/sqlitestudio/main.cpp
index 4ec98cc..0ac506f 100644
--- a/SQLiteStudio3/sqlitestudio/main.cpp
+++ b/SQLiteStudio3/sqlitestudio/main.cpp
@@ -34,6 +34,7 @@
 #include <QPluginLoader>

 #include <QDebug>

 #include <QMessageBox>

+#include <QProcess>

 

 bool listPlugins = false;

 

@@ -92,6 +93,7 @@ int main(int argc, char *argv[])
 {

     QApplication a(argc, argv);

 

+#ifdef PORTABLE_CONFIG

     int retCode = 1;

     UpdateManager::setRetryFunction(updateRetryFunction);

     if (UpdateManager::handleUpdateOptions(a.arguments(), retCode))

@@ -101,6 +103,7 @@ int main(int argc, char *argv[])
 

         return retCode;

     }

+#endif

 

     qInstallMessageHandler(uiMessageHandler);

 

@@ -163,7 +166,9 @@ int main(int argc, char *argv[])
     if (!dbToOpen.isNull())

         MainWindow::getInstance()->openDb(dbToOpen);

 

+#ifdef PORTABLE_CONFIG

     UPDATES->checkForUpdates();

+#endif

 

     return a.exec();

 }