X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmain.cpp;h=43a52d0da676737c050757d870af31223ac14683;hb=9bf0c85ec4cc3b2b52a17465e2991ee5ea73f396;hp=eef7947444aa64fbe8ec0d0009083e857940bfb5;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index eef79474..43a52d0d 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -41,11 +41,16 @@ # include "kcmdlinewrapper.h" #endif +#if !defined(BUILD_CORE) && defined(STATIC) +#include +Q_IMPORT_PLUGIN(qjpeg) +Q_IMPORT_PLUGIN(qgif) +#endif + #include "cliparser.h" #include "quassel.h" int main(int argc, char **argv) { - Q_INIT_RESOURCE(i18n); // Setup build information and version string # include "version.gen" @@ -87,11 +92,15 @@ int main(int argc, char **argv) { #endif #ifndef BUILD_QTCLIENT // put core-only arguments here + cliParser->addOption("listen
[,", 0, "The address(es) quasselcore will listen on", "0.0.0.0,::"); cliParser->addOption("port ",'p', "The port quasselcore will listen at", QString("4242")); cliParser->addSwitch("norestore", 'n', "Don't restore last core's state"); cliParser->addOption("logfile ", 'l', "Path to logfile"); cliParser->addOption("loglevel ", 'L', "Loglevel Debug|Info|Warning|Error", "Info"); - cliParser->addOption("datadir ", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert"); + cliParser->addOption("configdir ", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL Cert"); + cliParser->addOption("datadir ", 0, "DEPRECATED - Use --configdir instead"); + cliParser->addOption("select-backend ", 0, "Starts an interactive session and switches your current storage backend to the new one. Attempts a merge if the new backend is uninitialized and the old backend supports migration. Otherwise prompts for new user credentials!"); + cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user"); #endif #ifdef HAVE_KDE