From e5ad7f5bc0bc12d1931cc3c9f95ba78a940f9d2f Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 6 May 2009 18:21:13 +0200
Subject: [PATCH] Search for the QML parser in the standard QTDIR
---
src/plugins/duieditor/duieditor.pro | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/plugins/duieditor/duieditor.pro b/src/plugins/duieditor/duieditor.pro
index a2633e9d4de..ea534684668 100644
--- a/src/plugins/duieditor/duieditor.pro
+++ b/src/plugins/duieditor/duieditor.pro
@@ -8,8 +8,18 @@ include(../../plugins/texteditor/texteditor.pri)
include(../../shared/qscripthighlighter/qscripthighlighter.pri)
include(../../shared/indenter/indenter.pri)
-include($$(QTDIR_DUI)/src/declarative/qml/parser/parser.pri)
-INCLUDEPATH += $$(QTDIR_DUI)/src/declarative/qml # FIXME: remove me
+QT_BUILD_TREE=$$fromfile($$(QTDIR)/.qmake.cache,QT_BUILD_TREE)
+QT_SOURCE_TREE=$$fromfile($$(QTDIR)/.qmake.cache,QT_SOURCE_TREE)
+
+exists($$QT_SOURCE_TREE/src/declarative/qml/parser) {
+ include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri)
+ INCLUDEPATH += $$QT_SOURCE_TREE/src/declarative/qml
+} else {
+ isEmpty($$(QTDIR_DUI)):error(run with export QTDIR_DUI=<path to kinetic/qt>)
+ include($$(QTDIR_DUI)/src/declarative/qml/parser/parser.pri)
+ INCLUDEPATH += $$(QTDIR_DUI)/src/declarative/qml
+}
+
include(rewriter/rewriter.pri)
--
GitLab