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

List:       kde-commits
Subject:    branches/work/koffice-ko
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-04-12 7:32:55
Message-ID: 20100412073255.9F07EAC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1113903 by rempt:

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  +1 -7      CMakeLists.txt  


--- branches/work/koffice-ko/CMakeLists.txt #1113902:1113903
@@ -78,14 +78,8 @@
 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) \
+find_package(Qt4 4.6.0 REQUIRED)  
-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)
 include (MacroAdditionalCleanFiles)


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