From: akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Thu, 1 Apr 2010 14:52:18 +0000 (+0000)
Subject: Fix:core:Made Qt version detection better
X-Git-Tag: navit-0.5.0.5194svn~2081
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8471d005e5f26913ef753a4d50b6e14fc64b00ca;p=profile%2Fivi%2Fnavit.git

Fix:core:Made Qt version detection better


git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3110 ffa7fe5e-494d-0410-b361-a75ebd5db220
---

diff --git a/navit/configure.in b/navit/configure.in
index 7c7a5cb..6d4c2a6 100644
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -791,7 +791,8 @@ if test "x${gui_qml}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}"
 fi
 if test "x${gui_qml}" = "xyes" -a "x${QT_DECLARATIVE_CFLAGS}" = "x" -a "x${QT_DECLARATIVE_LIBS}" = "x"; then
 	PKG_CHECK_MODULES(QT_DECLARATIVE, [QtDeclarative >= 4.6.0 ], ,gui_qml=no;gui_qml_reason="Packages QtDeclarative missing")
-	PKG_CHECK_MODULES(QT_DECLARATIVE, [QtDeclarative >= 4.7.0 ], AM_CONDITIONAL(QT_DECLARATIVE_NEWAPI,test "x${gui_qml}" = "xyes"), )
+	QmlApiVersion=`$PKG_CONFIG QtDeclarative --modversion`
+	AM_CONDITIONAL(QT_DECLARATIVE_NEWAPI,test "x${QmlApiVersion}" != "x4.6.0" -a "x${QmlApiVersion}" != "x4.6.2" )
 fi
 if test "x${gui_qml}" = "xyes" ; then
 	AC_DEFINE(USE_GUI_QML, 1, [Build with gui qml])