From 147eac7e0465affaa4cea3d06b51b520b464eae8 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Mon, 17 Oct 2011 15:34:22 +0200
Subject: [PATCH] Fix make install for qml designer plugins.
Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
src/plugins/qmldesigner/desktopplugin/desktopplugin.pri | 5 -----
src/plugins/qmldesigner/extrasplugin/extrasplugin.pri | 5 -----
src/plugins/qmldesigner/meegoplugin/meegoplugin.pri | 5 -----
src/plugins/qmldesigner/plugindestdir.pri | 4 +++-
src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri | 5 -----
src/plugins/qmldesigner/symbianplugin/symbianplugin.pri | 5 -----
6 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
index 22e7883586f..302272967e2 100644
--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
@@ -15,8 +15,3 @@ HEADERS += $$PWD/desktopplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/desktopplugin.qrc
OTHER_FILES += $$PWD/desktop.metainfo
-
-!macx {
- target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
- INSTALLS += target
-}
diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
index 8110260be95..12f923cb1e5 100644
--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
@@ -15,8 +15,3 @@ HEADERS += $$PWD/extrasplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/extrasplugin.qrc
OTHER_FILES += $$PWD/extras.metainfo
-
-!macx {
- target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
- INSTALLS += target
-}
diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
index 659122a2f96..04abc898749 100644
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
@@ -15,8 +15,3 @@ HEADERS += $$PWD/meegoplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/meegoplugin.qrc
OTHER_FILES += $$PWD/meego.metainfo
-
-!macx {
- target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
- INSTALLS += target
-}
diff --git a/src/plugins/qmldesigner/plugindestdir.pri b/src/plugins/qmldesigner/plugindestdir.pri
index 40e0c95afd9..d4987e24093 100644
--- a/src/plugins/qmldesigner/plugindestdir.pri
+++ b/src/plugins/qmldesigner/plugindestdir.pri
@@ -1,5 +1,7 @@
macx {
DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
} else {
- DESTDIR = $$IDE_BUILD_TREE/lib/qtcreator/qmldesigner
+ DESTDIR = $$IDE_LIBRARY_PATH/qmldesigner
+ target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/qmldesigner
+ INSTALLS += target
}
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
index 98fc9c7f1a1..5870c378726 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
@@ -15,8 +15,3 @@ HEADERS += $$PWD/qtquickplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/qtquickplugin.qrc
OTHER_FILES += $$PWD/quick.metainfo
-
-!macx {
- target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
- INSTALLS += target
-}
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
index a874ef08b40..28d6323c68a 100644
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
+++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
@@ -15,8 +15,3 @@ HEADERS += $$PWD/symbianplugin.h $$PWD/../designercore/include/iwidgetplugin.h
RESOURCES += $$PWD/symbianplugin.qrc
OTHER_FILES += $$PWD/symbian.metainfo
-
-!macx {
- target.path = /$$IDE_LIBRARY_BASENAME/qmldesigner
- INSTALLS += target
-}
--
GitLab