From 0ad628ce96572f7c2abfd561d580e52cd49a7b37 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Tue, 18 Aug 2009 22:09:20 +0000
Subject: Fix detection of Qt's phonon, patch by Pavel Volkovitskiy, approved
 by Thiago. This needs Qt-4.5.3 when it's out or kde-qt (which has the fix
 backported). For older versions of Qt, it didn't work before, and it still
 won't work; we used standalone phonon instead (and most people still do).

svn path=/trunk/KDE/kdelibs/; revision=1013127
---
 modules/FindQt4.cmake | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 3ed05c06..7c79edeb 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -738,11 +738,13 @@ IF (QT4_QMAKE_FOUND)
     ${QT_HEADERS_DIR}/QtXmlPatterns
     NO_DEFAULT_PATH
     )
-  
+
   # Set QT_PHONON_INCLUDE_DIR
-  FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
+  # Qt >= 4.5.3 (or kde-qt-4.5.2 which has the fix too) : Phonon/ClassName is inside include/phonon
+  # With previous versions of Qt, this could not work; upgrade Qt or use a standalone phonon
+  FIND_PATH(QT_PHONON_INCLUDE_DIR Phonon
     PATHS
-    ${QT_INCLUDE_DIR}/phonon
+    ${QT_HEADERS_DIR}/phonon
     NO_DEFAULT_PATH
     )
 
-- 
cgit v1.2.1