From 21761a4e1c6dde5259a61628e23a424106a51da2 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Tue, 21 Feb 2012 13:24:00 +0100
Subject: Qt5Declarative and Qt5Quick are actually incompatible

They can't be used together.
---
 modules/FindQt5Transitional.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/FindQt5Transitional.cmake')

diff --git a/modules/FindQt5Transitional.cmake b/modules/FindQt5Transitional.cmake
index 5e67b47d..3ff9490f 100644
--- a/modules/FindQt5Transitional.cmake
+++ b/modules/FindQt5Transitional.cmake
@@ -9,7 +9,6 @@ if (QT5_BUILD)
           DBus
           DBusTools # For macros
           Designer
-          Declarative
           Script
           ScriptTools
           Network
@@ -21,13 +20,16 @@ if (QT5_BUILD)
           PrintSupport
           Concurrent
           UiTools
-          Quick
+          Quick1
           WebKit
         )
       find_package(Qt5${_component})
     endforeach()
   else()
     foreach(_component ${Qt5Transitional_FIND_COMPONENTS})
+      if ("${_component}" STREQUAL "Declarative")
+        set(_component Quick1)
+      endif()
       find_package(Qt5${_component} REQUIRED)
       if ("${_component}" STREQUAL "Gui")
         find_package(Qt5Widgets REQUIRED)
-- 
cgit v1.2.1