From a09851e479904721d215c7e8c4865045a84f515a Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 20 Jul 2011 12:38:03 +0200
Subject: [PATCH] QmlExtension wizard: Use $$[QT_INSTALL_IMPORTS] for desktop
targets
Change-Id: I1d3dc0c148a5f05d81f6cc0d22c3b13c504a1edb
Reviewed-on: http://codereview.qt.nokia.com/1875
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
share/qtcreator/templates/wizards/qml-extension/project.pro | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/share/qtcreator/templates/wizards/qml-extension/project.pro b/share/qtcreator/templates/wizards/qml-extension/project.pro
index e419173897d..e7d60f36765 100644
--- a/share/qtcreator/templates/wizards/qml-extension/project.pro
+++ b/share/qtcreator/templates/wizards/qml-extension/project.pro
@@ -29,7 +29,11 @@ qmldir.files = qmldir
symbian {
TARGET.EPOCALLOWDLLDATA = 1
} else:unix {
- installPath = /usr/lib/qt4/imports/$$replace(uri, \\., /)
+ maemo5 | !isEmpty(MEEGO_VERSION_MAJOR) {
+ installPath = /usr/lib/qt4/imports/$$replace(uri, \\., /)
+ } else {
+ installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
+ }
qmldir.path = $$installPath
target.path = $$installPath
INSTALLS += target qmldir
--
GitLab