From e1fa3cb248b064f87327ec6530161f1a7e5ade5c Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Tue, 7 Aug 2018 17:47:50 +0200
Subject: [PATCH] Update the server_monitor example client to Qt5

(cherry picked from commit ab72f9459501838f01f993c584c450997355678e)
---
 development/lyxserver/server_monitor.cpp | 3 +++
 development/lyxserver/server_monitor.h   | 1 +
 development/lyxserver/server_monitor.pro | 2 ++
 status.23x                               | 9 +++++++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/development/lyxserver/server_monitor.cpp b/development/lyxserver/server_monitor.cpp
index 21eb4194fe..dc4f15d05a 100644
--- a/development/lyxserver/server_monitor.cpp
+++ b/development/lyxserver/server_monitor.cpp
@@ -41,6 +41,9 @@
 #include <QApplication>
 #include <QtGui>
 #include <QtDebug>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 #include "server_monitor.h"
 
diff --git a/development/lyxserver/server_monitor.h b/development/lyxserver/server_monitor.h
index 32d035e448..5f8c628f98 100644
--- a/development/lyxserver/server_monitor.h
+++ b/development/lyxserver/server_monitor.h
@@ -13,6 +13,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include <QDialog>
 #include <QFile>
diff --git a/development/lyxserver/server_monitor.pro b/development/lyxserver/server_monitor.pro
index c10e19dd98..934b176778 100644
--- a/development/lyxserver/server_monitor.pro
+++ b/development/lyxserver/server_monitor.pro
@@ -1,2 +1,4 @@
+CONFIG += console
 HEADERS += server_monitor.h
 SOURCES += server_monitor.cpp
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
diff --git a/status.23x b/status.23x
index 8fda769737..b7383bc111 100644
--- a/status.23x
+++ b/status.23x
@@ -15,8 +15,8 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
-- Updated Arabic, Chinese (Simplified), German, Russian, Slovakian and Ukrainian
-  user interface localization.
+- Updated Arabic, Chinese (Simplified), German, Italian, Russian, Slovakian
+  and Ukrainian user interface localization.
 
 - It possible to anonymize document's content for bug submissions
   via buffer-anonymize lfun (bug 7259).
@@ -33,6 +33,11 @@ What's new
 - Fix problems with default conversion script for graphics (part of bug 11186).
 
 
+* MISCELLANEOUS
+
+- Updated to Qt5 the LyX server example client in development/lyxserver/
+
+
 * TEX2LYX IMPROVEMENTS
 
 - Add support for biblatex.