From: gregor herrmann <gregor@toastfreeware.priv.at>
Date: Wed, 30 Aug 2017 18:38:27 +0000 (+0200)
Subject: Merge branch 'master' into qt5
X-Git-Tag: 0.6.3~16
X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/commitdiff_plain/809b5e5774aa31127a62699a4cdd960b2f9892b0

Merge branch 'master' into qt5
---

809b5e5774aa31127a62699a4cdd960b2f9892b0
diff --cc src/gui/mainwindow.h
index 5c65772,537d81e..09203e4
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@@ -20,7 -20,8 +20,8 @@@
  #ifndef MAINWINDOW_H
  #define MAINWINDOW_H
  
 -#include <QtGui/QMainWindow>
 +#include <QtWidgets>
+ #include <QSslError>
  
  #include "ui_mainwindow.h"