[Pkg-owncloud-commits] [owncloud-client] 25/333: make BUILD_WITH_QT4 off by default

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:29 UTC 2014


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit a5379ef2aaeb5b155dc430eac95551a91069c75c
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Feb 12 11:25:08 2014 +0100

    make BUILD_WITH_QT4 off by default
    
    Rationale:
    When Qt5 is not found, the script will automatically use Qt4.
    However, without this change, when Qt4 is not found, it will not
    try to find Qt5 because BUILD_WITH_QT4 is ON by default forbidding the
    use of Qt5 even if it is installed.
    
    Also, other packages default to Qt5 including qtkeychain
    
    See also issue #1418
---
 cmake/modules/QtVersionAbstraction.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake
index 017c7ba..1d8403d 100644
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -2,7 +2,7 @@ include (MacroOptionalFindPackage)
 include (MacroLogFeature)
 
 
-option(BUILD_WITH_QT4 "Build with Qt4 no matter if Qt5 was found" ON)
+option(BUILD_WITH_QT4 "Build with Qt4 no matter if Qt5 was found" OFF)
 
 if( NOT BUILD_WITH_QT4 )
     find_package(Qt5Core QUIET)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list