From d9aa870e5d509cc7309ab82dd102a937ab58613a Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Thu, 9 Feb 2017 04:36:04 -0500 Subject: Imported Upstream version 3.1.1+dfsg1 --- SQLiteStudio3/sqlitestudio/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'SQLiteStudio3/sqlitestudio/main.cpp') 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 ."), 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]; -- cgit v1.2.3