On Mon, Aug 25, 2014 at 05:54:08PM +0200, Enrico Forestieri wrote: > On Mon, Aug 25, 2014 at 04:18:02PM +0200, Stephan Witt wrote: > > > > > Am 25.08.2014 um 16:12 schrieb Kornel Benko <kor...@lyx.org>: > > > > > Am Montag, 25. August 2014 um 16:08:27, schrieb Kornel Benko > > > <kor...@lyx.org> > > >> At least on QT4 there is no symbol Q_OS_X11. So this patch would break > > >> QT4 > > >> compilation. > > >> > > > > > > To be more specific > > > > > > FindQt4.cmake: > > > We should check for Q_WS_X11, but assign variable Q_OS_X11. > > > > Yes, my fault, Q_OS_X11 is not defined. But Q_WS_X11 doesn't exist within > > Qt5 > > either. > > Not only that. Some of the Q_WS_WIN guards should not be replaced at all, > othewise it will not compile with Qt5. For example, the QWindowsMime class > is not available anymore and, until they make it available again, that > guard should not be replaced. So, I suggest to replace the guards only > if you are able to check the result. > > Another side effect is that my Qt5 port for cygwin will require its own > guard now that Q_WS_WIN is not available anymore. I wonder what they were > drinking when that decision was taken...
I went ahead and replaced almost all occurrences of Q_WS_WIN as appropriate for Qt5. The remaining ones are those related to code that doesn't compile on Qt5, ATM. -- Enrico
