]> git.lyx.org Git - features.git/commit
Adjust preprocessor guards for Qt5/X11.
authorEnrico Forestieri <forenr@lyx.org>
Sun, 11 Jan 2015 18:36:41 +0000 (19:36 +0100)
committerEnrico Forestieri <forenr@lyx.org>
Sun, 11 Jan 2015 18:44:35 +0000 (19:44 +0100)
commitd4428ceb81d12dde60102ad0bb3d1503efc54eda
treeaa08dfad5c00a11e0ab365b47d967469c21ebaa3
parent5d6351d4763ce9ec209b491d7a507cf00d819288
Adjust preprocessor guards for Qt5/X11.

This fixes the -geometry command line option and restores the
"Use icons from system's theme" checkbox in the preferences.

There is still code addressing Qt4 and xlib that has to be
audited. This code cannot be compiled with Qt5 because the
default backend is now xcb and not xlib. I have marked such
code with a "FIXME QT5" comment.
config/qt4.m4
src/frontends/qt4/GuiApplication.cpp
src/frontends/qt4/GuiApplication.h
src/frontends/qt4/GuiClipboard.cpp
src/frontends/qt4/GuiPainter.cpp
src/frontends/qt4/GuiPrefs.cpp
src/frontends/qt4/GuiView.cpp
src/frontends/qt4/GuiWorkArea.cpp