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

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/cmake/modules
From:       David Faure <faure () kde ! org>
Date:       2009-08-18 22:10:22
Message-ID: 1250633422.877261.12344.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1013128 by dfaure:

Backport: 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).


 M  +5 -3      FindQt4.cmake  


--- branches/KDE/4.3/kdelibs/cmake/modules/FindQt4.cmake #1013127:1013128
@@ -738,11 +738,13 @@
     ${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
     )
 
[prev in list] [next in list] [prev in thread] [next in thread]