diff options
| author | Jonathan Bauer | 2017-11-15 10:05:29 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2017-11-15 10:05:29 +0100 |
| commit | a98536b9fbda7d7fb2ff78906c1a2d6331f33df2 (patch) | |
| tree | 4cc26402b6f18228773f0b4301477ac8325342e8 /src/server | |
| parent | [client] Delay showBar by 750ms (diff) | |
| download | pvs2-a98536b9fbda7d7fb2ff78906c1a2d6331f33df2.tar.gz pvs2-a98536b9fbda7d7fb2ff78906c1a2d6331f33df2.tar.xz pvs2-a98536b9fbda7d7fb2ff78906c1a2d6331f33df2.zip | |
port to qt5
* got rid of the Win32/X11 differentiation
* due to QT5, additional packages are needed to compile
** libqt5x11extras5-dev
** libqt5svg5-dev
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/clicklabel/clicklabel.h | 2 | ||||
| -rw-r--r-- | src/server/connectionframe/connectionframe.h | 2 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 2 | ||||
| -rw-r--r-- | src/server/sessionnamewindow/sessionnamewindow.cpp | 2 | ||||
| -rw-r--r-- | src/server/sessionnamewindow/sessionnamewindow.h | 2 | ||||
| -rw-r--r-- | src/server/util/platform/screensaver.cpp (renamed from src/server/util/platform/screensaver_X11.cpp) | 0 |
7 files changed, 6 insertions, 6 deletions
diff --git a/src/server/clicklabel/clicklabel.h b/src/server/clicklabel/clicklabel.h index 4d730a9..4c5a898 100644 --- a/src/server/clicklabel/clicklabel.h +++ b/src/server/clicklabel/clicklabel.h @@ -1,7 +1,7 @@ #ifndef _CLICKLABEL_H_ #define _CLICKLABEL_H_ -#include <QtGui> +#include <QtWidgets> #include <QLabel> /** diff --git a/src/server/connectionframe/connectionframe.h b/src/server/connectionframe/connectionframe.h index 7f338a8..72f57f3 100644 --- a/src/server/connectionframe/connectionframe.h +++ b/src/server/connectionframe/connectionframe.h @@ -1,6 +1,6 @@ #ifndef _CONNECTIONFRAME_H_ #define _CONNECTIONFRAME_H_ -#include <QtGui> +#include <QtWidgets> #include "../net/client.h" class MainWindow; diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 2eab581..d4819cf 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -16,7 +16,7 @@ // Self #include "mainwindow.h" // QT stuff -#include <QtGui> +#include <QtWidgets> #include <QFileDialog> #include <QSvgRenderer> #include <QPainter> diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 27bf264..ac59481 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -1,7 +1,7 @@ #ifndef _MAINWINDOW_H_ #define _MAINWINDOW_H_ -#include <QtGui> +#include <QtWidgets> #include <QMainWindow> #include "../net/client.h" diff --git a/src/server/sessionnamewindow/sessionnamewindow.cpp b/src/server/sessionnamewindow/sessionnamewindow.cpp index cc4d751..c171f53 100644 --- a/src/server/sessionnamewindow/sessionnamewindow.cpp +++ b/src/server/sessionnamewindow/sessionnamewindow.cpp @@ -14,7 +14,7 @@ # ----------------------------------------------------------------------------- */ -#include <QtGui> +#include <QtWidgets> #include "sessionnamewindow.h" #include "../serverapp/serverapp.h" #include "../numerickeyboard/numerickeyboard.h" diff --git a/src/server/sessionnamewindow/sessionnamewindow.h b/src/server/sessionnamewindow/sessionnamewindow.h index 2338def..e46b895 100644 --- a/src/server/sessionnamewindow/sessionnamewindow.h +++ b/src/server/sessionnamewindow/sessionnamewindow.h @@ -1,7 +1,7 @@ #ifndef _SESSIONNAMEWINDOW_H_ #define _SESSIONNAMEWINDOW_H_ -#include <QtGui> +#include <QtWidgets> namespace Ui diff --git a/src/server/util/platform/screensaver_X11.cpp b/src/server/util/platform/screensaver.cpp index efffba9..efffba9 100644 --- a/src/server/util/platform/screensaver_X11.cpp +++ b/src/server/util/platform/screensaver.cpp |