Merge remote-tracking branch 'upstream/master'

Author: melcon

src/channel.h

@@ -28,6 +28,7 @@
 #include <QDateTime>
 #include <QFile>
 #include <QTextStream>
+#include <QVersionNumber>
 #include "global.h"
 #include "buffer.h"
 #include "util.h"

src/res/translation/translation_es_ES.qm

@@ -36,6 +36,7 @@
 #include <QSystemTrayIcon>
 #include <QSettings>
 #include <QFileDialog>
+#include <QVersionNumber>
 #include "global.h"
 #include "server.h"
 #include "settings.h"