mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-24 18:43:37 +00:00
remove support for Qt4 in server_monitor
Update TODO.killqt4
This commit is contained in:
parent
cd5fe091d2
commit
bc1cabc480
@ -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
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
CONFIG += console
|
||||
HEADERS += server_monitor.h
|
||||
SOURCES += server_monitor.cpp
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
QT += widgets
|
||||
|
Loading…
Reference in New Issue
Block a user