Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 5 insertions, 0 deletions

diff --git a/SQLiteStudio3/sqlitestudio/main.cpp b/SQLiteStudio3/sqlitestudio/main.cpp
index 94ee80e..829d657 100644
--- a/SQLiteStudio3/sqlitestudio/main.cpp
+++ b/SQLiteStudio3/sqlitestudio/main.cpp
@@ -53,6 +53,7 @@ QString uiHandleCmdLineArgs()
     QCommandLineOption sqlDebugDbNameOption("debug-sql-db", QObject::tr("Limits SQL query messages to only the given <database>."), QObject::tr("database"));

     QCommandLineOption executorDebugOption("debug-query-executor", QObject::tr("Enables debugging of SQLiteStudio's query executor."));

     QCommandLineOption listPluginsOption("list-plugins", QObject::tr("Lists plugins installed in the SQLiteStudio and quits."));

+    QCommandLineOption masterConfigOption("master-config", QObject::tr("Points to the master configuration file. Read manual at wiki page for more details."), QObject::tr("SQLiteStudio settings file"));

     parser.addOption(debugOption);

     parser.addOption(debugStdOutOption);

     parser.addOption(debugFileOption);

@@ -60,6 +61,7 @@ QString uiHandleCmdLineArgs()
     parser.addOption(sqlDebugOption);

     parser.addOption(sqlDebugDbNameOption);

     parser.addOption(executorDebugOption);

+    parser.addOption(masterConfigOption);

     parser.addOption(listPluginsOption);

 

     parser.addPositionalArgument(QObject::tr("file"), QObject::tr("Database file to open"));

@@ -77,6 +79,9 @@ QString uiHandleCmdLineArgs()
     if (parser.isSet(listPluginsOption))

         listPlugins = true;

 

+    if (parser.isSet(masterConfigOption))

+        Config::setMasterConfigFile(parser.value(masterConfigOption));

+

     QStringList args = parser.positionalArguments();

     if (args.size() > 0)

         return args[0];