[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-04-29 15:17:56
Message-ID: 20100429151756.997A3AC7E4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1120651 by rempt:

Merged revisions 1113903 via svnmerge from 
https://rempt@svn.kde.org/home/kde/branches/work/koffice-ko

........
  r1113903 | rempt | 2010-04-12 09:32:55 +0200 (Mon, 12 Apr 2010) | 4 lines
  
  Remove the 4.5 compilation override
  
  With the TOC patch, compilation with Qt 4.5 is no longer possible,
  so 4.6 is now a hard requirement for the branch.
........


 _M            . (directory)  
 M  +0 -6      CMakeLists.txt  


--- trunk/koffice/CMakeLists.txt #1120650:1120651
@@ -81,13 +81,7 @@
 set(KDE_MIN_VERSION "4.3.0")
 find_package(KDE4 4.3.0 REQUIRED)
 
-option(FORCE_COMPILATION_WITH_QT45 "This option force KOffice to accept compilation \
                with Qt4.5, but note that this is not supported by KOffice team" OFF)
-
-if(FORCE_COMPILATION_WITH_QT45)
-  find_package(Qt4 4.5.0 REQUIRED)
-else(FORCE_COMPILATION_WITH_QT45)
   find_package(Qt4 4.6.0 REQUIRED)
-endif(FORCE_COMPILATION_WITH_QT45)
 
 include(KDE4Defaults)
 include(MacroLibrary)


[prev in list] [next in list] [prev in thread] [next in thread]