Merge branch 'master' into qt5
authorgregor herrmann <gregor@toastfreeware.priv.at>
Wed, 30 Aug 2017 18:38:27 +0000 (20:38 +0200)
committergregor herrmann <gregor@toastfreeware.priv.at>
Wed, 30 Aug 2017 18:38:27 +0000 (20:38 +0200)
1  2 
src/gui/eventdialog.cpp
src/gui/mainwindow.h
src/gui/searchhead.h
src/mvc/conferencemodel.h
src/mvc/delegate.cpp
src/mvc/delegate.h
src/mvc/eventmodel.cpp
src/sql/sqlengine.cpp

Simple merge
@@@ -20,7 -20,8 +20,8 @@@
  #ifndef MAINWINDOW_H
  #define MAINWINDOW_H
  
 -#include <QtGui/QMainWindow>
 +#include <QtWidgets>
+ #include <QSslError>
  
  #include "ui_mainwindow.h"
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge