On Thu, Jun 09, 2011 at 01:00:28AM +0200, [email protected] wrote: > Date: Thu Jun 9 01:00:28 2011 > New Revision: 38997 > URL: http://www.lyx.org/trac/changeset/38997 > > Log: > Use decimal representation of QT_VERSION for moc-run in cmake build to match > the qglobal.h computation > > Modified: > lyx-devel/trunk/CMakeLists.txt > > Modified: lyx-devel/trunk/CMakeLists.txt > ============================================================================== > --- lyx-devel/trunk/CMakeLists.txt Wed Jun 8 22:22:27 2011 (r38996) > +++ lyx-devel/trunk/CMakeLists.txt Thu Jun 9 01:00:28 2011 (r38997) > @@ -618,8 +618,7 @@ > > # Compute qt4-version from ${QTVERSION} > if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*") > - MATH(EXPR QT4_VERSIONNUM > "${CMAKE_MATCH_1}*10000+${CMAKE_MATCH_2}*100+${CMAKE_MATCH_3}") > - set(QT4_VERSION "0x${QT4_VERSIONNUM}") > + MATH(EXPR QT4_VERSION > "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}") > endif() > > add_subdirectory(src "${TOP_BINARY_DIR}/src")
Wasn't the original problem that QPropertyAnimation was new in 4.7? If that's the case why not #if QT_VERSION-guard the #include <QPropertyAnimation> and the body of the not-so-important function IconButton::animateShow() which seems to be the only use QPropertyAnimation? Or even remove that entirely? Mutilating the rest of the class and fixing the Three Favourite Build Systems does not seem to be warranted by that kind of problem, does it? Andre'
