diff options
| author | Jonathan Bauer | 2017-11-15 10:16:41 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2017-11-15 10:16:41 +0100 |
| commit | 68f20592b5f20ea559c363305e1e1793e9c3640f (patch) | |
| tree | 68d8411cbb1ee4d708bd280cde56bb90cc2a9126 | |
| parent | Bring window to top periodically (diff) | |
| download | beamergui-68f20592b5f20ea559c363305e1e1793e9c3640f.tar.gz beamergui-68f20592b5f20ea559c363305e1e1793e9c3640f.tar.xz beamergui-68f20592b5f20ea559c363305e1e1793e9c3640f.zip | |
qt5 port
| -rw-r--r-- | src/beamergui.pro | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/widget.cpp | 2 | ||||
| -rw-r--r-- | src/widget.h | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/beamergui.pro b/src/beamergui.pro index 3ff480a..1b9ee2a 100644 --- a/src/beamergui.pro +++ b/src/beamergui.pro @@ -6,7 +6,7 @@ QT += core gui # qt4 -#QT += widgets # qt5 +QT += widgets # qt5 TARGET = beamergui TEMPLATE = app diff --git a/src/main.cpp b/src/main.cpp index 7c2daab..8f90cd7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ // Copyright 2013, University of Freiburg, // Author: Manuel Schneider <ms1144> -#include <QtGui/QApplication> // for Qt4 +#include <QtWidgets/QApplication> // for Qt4 #include "widget.h" int main(int argc, char *argv[]) diff --git a/src/widget.cpp b/src/widget.cpp index 3e23385..b3a559f 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -5,7 +5,7 @@ #include <algorithm> #include <QDebug> -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include "widget.h" #include "ui_widget.h" diff --git a/src/widget.h b/src/widget.h index 4d0df14..55caa63 100644 --- a/src/widget.h +++ b/src/widget.h @@ -4,9 +4,7 @@ #ifndef WIDGET_H #define WIDGET_H -#include <QtGui> // for Qt4 -#include <QWidget> // for Qt4 -//#include <QtWidgets> // for Qt5 +#include <QtWidgets> // for Qt5 #include <QDebug> #include <X11/Xlib.h> |