[Pkg-owncloud-commits] [owncloud-client] 134/333: Error out if a Qt module is missing

[Sandro Knauß]

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 80e583c3371a564c08a2d143f4462730e16bba85
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed Mar 12 18:18:02 2014 +0100

    Error out if a Qt module is missing
    
    Fixes #1487
---
 cmake/modules/QtVersionAbstraction.cmake | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake
index 1d8403d..e707866 100644
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -7,15 +7,15 @@ option(BUILD_WITH_QT4 "Build with Qt4 no matter if Qt5 was found" OFF)
 if( NOT BUILD_WITH_QT4 )
     find_package(Qt5Core QUIET)
     if( Qt5Core_DIR )
-        find_package(Qt5Widgets QUIET)
-        find_package(Qt5Quick QUIET)
-        find_package(Qt5PrintSupport QUIET)
-        find_package(Qt5WebKit QUIET)
-        find_package(Qt5Location QUIET)
-        find_package(Qt5Network QUIET)
-        find_package(Qt5Sensors QUIET)
-        find_package(Qt5Xml QUIET)
-#        find_package(Qt5WebKitWidgets QUIET)
+        find_package(Qt5Widgets REQUIRED)
+        find_package(Qt5Quick REQUIRED)
+        find_package(Qt5PrintSupport REQUIRED)
+        find_package(Qt5WebKit REQUIRED)
+        find_package(Qt5Location REQUIRED)
+        find_package(Qt5Network REQUIRED)
+        find_package(Qt5Sensors REQUIRED)
+        find_package(Qt5Xml REQUIRED)
+#        find_package(Qt5WebKitWidgets REQUIRED)
 
         message(STATUS "Using Qt 5!")
 
@@ -78,7 +78,7 @@ if( NOT Qt5Core_DIR )
         list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
     endif()
 
-    macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+    find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
     macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
 
     macro(qt5_use_modules)

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