Stephan Witt wrote: > I'll attach my current diff improving your patches to make LyX ready for > using Qt5 frameworks. I had to take care for missing QPA modules in Qt-5.0 > and Qt-5.1 and added to auto tools support. > > If no one objects I'll commit this as it works with 4.8.5. The menu issues > can be solved in a next step.
I think it is good, but what about the differences of Q_OS_MACX and Q_WS_MACX in 4.x I wrote about in an earlier mail? Q_OS_MACX is also true for the X11 OSX version, while Q_WS_MACX is not. If we decide that we don't support the X11 version the patch is fine, otherwise it would need to be checked, or we would need some defines of our own as Benjamin suggested. The most simple one would probably be to define Q_WS_MACX ourselves in config.h: #if QT_VERSION >= 0x050000 && defined(Q_OS_MACX) #define Q_WS_MACX #endif This has the advantage that the qt 4.x code would be exactly the same as now (no testing effort thrown away), and qt5 is also 100% correct (X11 version not supported anymore). Georg
