Fix make install for qml designer plugins.

Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
index 22e7883..3022729 100644 (file)
--- 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 8110260..12f923c 100644 (file)
--- 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 659122a..04abc89 100644 (file)
--- 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 40e0c95..d4987e2 100644 (file)
--- 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 98fc9c7..5870c37 100644 (file)
--- 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 a874ef0..28d6323 100644 (file)
--- 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
-}