X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=2a33a3d801200643f96e1733444fbbb33f07d2b7;hb=52278ac6a6e904e3ffa2ab7efbb35f75e71161ff;hp=3bcecbbdf8ec580f9e2ebbe85b1fe5a2902e0a0b;hpb=8f2a90212f31c3f8e1301fe28dfeb6ccfc753b23;p=quassel.git

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 3bcecbbd..2a33a3d8 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 <QtPlugin>
+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,8 @@ int main(int argc, char **argv) {
   cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
   cliParser->addOption("logfile <path>", 'l', "Path to logfile");
   cliParser->addOption("loglevel <level>", 'L', "Loglevel Debug|Info|Warning|Error", "Info");
-  cliParser->addOption("datadir <path>", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert");
+  cliParser->addOption("configdir <path>", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL Cert");
+  cliParser->addOption("datadir <path>", 0, "DEPRECATED - Use --configdir instead");
 #endif
 
 #ifdef HAVE_KDE