Update the server_monitor example client to Qt5

(cherry picked from commit ab72f9459501838f01f993c584c450997355678e)

diff --git a/development/lyxserver/server_monitor.cpp b/development/lyxserver/server_monitor.cpp
index 21eb4194fefbad315e5effffdca22967e96b5953..dc4f15d05a0e8b0ddeda9328d71deb4c0ad088b8 100644 (file)
--- 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 32d035e44816d52e5c23e2a0358a759063ee98c6..5f8c628f98d16a17862c38d80f938ef0496bfdb2 100644 (file)
--- 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 c10e19dd98e3b95f241803adfd7d68f62910e6ee..934b1767787672e9f2ef3d1ff1cb5fb60a986aa6 100644 (file)
--- 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 8fda769737b34623fa3da2a09aae72709a7330ae..b7383bc111abe0939298139e8aeb058ab59af12d 100644 (file)
--- 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.