remove support for Qt4 in server_monitor

Update TODO.killqt4

diff --git a/TODO.killqt4 b/TODO.killqt4
index a79d0ebef2932f26cb87cb1288263841183c9b4e..d1f7a6067c0696e069563fb2486f0848fee343f4 100644 (file)
--- a/TODO.killqt4
+++ b/TODO.killqt4
@@ -4,7 +4,4 @@ Things left to do after killing Qt4 (obtained by grepping for Qt4 and 'Qt 4'):
 * update cmake
 * check whether development/autotests/keytest.py really needs QT4
   investigate references to Qt4 in keytest
-* update or remove development/lyx.rpm.README
-* update or remove development/lyxserver/server_monitor.cpp
-* update or remove development/tools/count_total_lines_of_compiled_code.sh
 

diff --git a/development/lyxserver/server_monitor.cpp b/development/lyxserver/server_monitor.cpp
index dc4f15d05a0e8b0ddeda9328d71deb4c0ad088b8..0b28fe6a2ebf0f9024f61e51f9193278c67a04d4 100644 (file)
--- a/development/lyxserver/server_monitor.cpp
+++ b/development/lyxserver/server_monitor.cpp
@@ -11,8 +11,8 @@
  * receives information back from LyX.
  *
  * Build instructions:
- * 1) Run moc or moc-qt4 on server_monitor.h to produce moc_server_monitor.cpp:
- *    moc-qt4 server_monitor.h -o moc_server_monitor.cpp
+ * 1) Run moc or moc-qt5 on server_monitor.h to produce moc_server_monitor.cpp:
+ *    moc server_monitor.h -o moc_server_monitor.cpp
  * 2) If the QtGui.pc file is not in the pkg-config search path, find the
  *    directory where it is located (e.g., use the command `locate QtGui.pc')
  *    and set the environment variable PKG_CONFIG_PATH to this directory.
@@ -22,7 +22,7 @@
  *    If the command `pkg-config --modversion QtGui' does not complain and
  *    prints the Qt version, you don't need to set PKG_CONFIG_PATH.
  * 3) Compile using the following command:
- *    g++ server_monitor.cpp -o monitor -I. `pkg-config --cflags --libs QtGui`
+ *    g++ -fPIC server_monitor.cpp -o monitor -I. `pkg-config --cflags --libs Qt5Gui Qt5Widgets`
  *
  * Alternatively, you can create a Makefile with qmake and then build
  * the executable by running make (or nmake, if you use msvc):
@@ -41,9 +41,7 @@
 #include <QApplication>
 #include <QtGui>
 #include <QtDebug>
-#if QT_VERSION >= 0x050000
 #include <QtWidgets>
-#endif
 
 #include "server_monitor.h"
 

diff --git a/development/lyxserver/server_monitor.pro b/development/lyxserver/server_monitor.pro
index 934b1767787672e9f2ef3d1ff1cb5fb60a986aa6..d5f40bc40be4021e13fe62b46326e7d118811dde 100644 (file)
--- a/development/lyxserver/server_monitor.pro
+++ b/development/lyxserver/server_monitor.pro
@@ -1,4 +1,4 @@
 CONFIG += console
 HEADERS += server_monitor.h
 SOURCES += server_monitor.cpp
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += widgets