On Thu, Jun 26, 2014 at 7:06 PM, Uwe Stöhr <uwesto...@web.de> wrote: > Am 26.06.2014 10:11, schrieb Kornel Benko: > > >>>> The patch implements the use of LYX_USE_QT variable, so the default >>>> compilation should use >>>> qt4 even if also qt5 devel files are installed. >>> >>> >>> That would be very helpful. This way I can try Qt 5 for master and use >>> Qt 4 to compile releases of 2.1. Please commit. >> >> >> Done. I am pretty sure, this does not break users using Qt4. > > > Thank you. I tested that the compilation with Qt4 works fine as before. > > Do you have any clue why a merged build fails with trunk and master? Do we > need to fix this or not? If not, then the CMake flag for merged builds > should be removed to avoid the troubles had.
Are you able to build the merged build with an older git commit? I know it worked for you before but it sounds like your build environment has changed, so it would be nice to rule that possibility out first. Scott
