projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use QSslCertificate::isNull() instead of isValid() in IdentityEditWidget
[quassel.git]
/
src
/
common
/
main.cpp
diff --git
a/src/common/main.cpp
b/src/common/main.cpp
index
ced7d5b
..
149167c
100644
(file)
--- a/
src/common/main.cpp
+++ b/
src/common/main.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-52,10
+52,7
@@
Q_IMPORT_PLUGIN(qgif)
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- // Setup build information and version string
- # include "version.gen"
- buildinfo.append(QString(",%1,%2").arg(__DATE__, __TIME__));
- Quassel::setupBuildInfo(buildinfo);
+ Quassel::setupBuildInfo();
QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName);
QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName);
QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain);
QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName);
QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName);
QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain);
@@
-118,6
+115,7
@@
int main(int argc, char **argv)
#ifdef HAVE_SSL
cliParser->addSwitch("require-ssl", 0, "Require SSL for client connections");
#endif
#ifdef HAVE_SSL
cliParser->addSwitch("require-ssl", 0, "Require SSL for client connections");
#endif
+ cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)");
#endif
#ifdef HAVE_KDE
#endif
#ifdef HAVE_KDE