Merge branch 'master' into moderation

lib/appbase/.clang-format

@@ -0,0 +1,34 @@
+Language: Cpp
+
+AccessModifierOffset: -1
+AccessModifierOffset: -4
+AlignEscapedNewlinesLeft: true
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: false
+AlwaysBreakBeforeMultilineStrings: false
+BasedOnStyle: Google
+BraceWrapping: {
+    AfterNamespace: 'false'
+    AfterClass: 'true'
+    BeforeElse: 'true'
+    AfterControlStatement: 'true'
+    AfterFunction: 'true'
+    BeforeCatch: 'true'
+}
+BreakBeforeBraces: Custom
+BreakConstructorInitializersBeforeComma: true
+ColumnLimit: 80
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+DerivePointerBinding: false
+FixNamespaceComments: true
+IndentCaseLabels: true
+IndentWidth: 4
+IndentWrappedFunctionNames: true
+IndentPPDirectives: AfterHash
+NamespaceIndentation: Inner
+PointerBindsToType: false
+SpacesBeforeTrailingComments: 2
+Standard: Auto
+ReflowComments: false

lib/libcommuni.pri

@@ -1,3 +1,5 @@
+DEFINES += IRC_NAMESPACE=Communi
+
 include(../lib/libcommuni/src/core/core.pri)
 include(../lib/libcommuni/src/model/model.pri)
 include(../lib/libcommuni/src/util/util.pri)

lib/qtkeychain.pri

@@ -0,0 +1 @@
+include(qtkeychain/qt5keychain.pri)