X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=b12d642ebd7abb9eb29a52fcf4424025a939b65f;hp=3bcecbbdf8ec580f9e2ebbe85b1fe5a2902e0a0b;hb=7b4bac1b744a407d51f0ece67e0d531206ddad0b;hpb=8f2a90212f31c3f8e1301fe28dfeb6ccfc753b23 diff --git a/src/common/main.cpp b/src/common/main.cpp index 3bcecbbd..b12d642e 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" @@ -92,7 +97,10 @@ int main(int argc, char **argv) { 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("migrate-backend ", 0, "Starts an interactive session and attempts to migrate your current storage backend to the new one"); + cliParser->addOption("select-backend ", 0, "Starts an interactive session and switches your current storage backend to the new one. No migration will be done!"); #endif #ifdef HAVE_KDE