Fix plugin installation when using release Qt 5.1.1

Change-Id: I6bf2aef3349e407d3f13739677a4b60bf370127b
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

13 files changed, 4 insertions, 431 deletions

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
deleted file mode 100644
index 0225494e..00000000
--- a/src/imports/imports.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += uml
diff --git a/src/imports/uml/UmlClass.qml b/src/imports/uml/UmlClass.qml
deleted file mode 100644
index 4601501a..00000000
--- a/src/imports/uml/UmlClass.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtUml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-UmlElement {
-    UmlSlot {
-        id: nameSlot
-        anchors.top: parent.top
-        Text {
-            id: label
-            text: element.name
-            anchors.centerIn: parent
-            font { family: "Korolev"; italic: element.isAbstract }
-        }
-    }
-    UmlSlot {
-        id: attributeSlot
-        anchors { top: nameSlot.bottom; topMargin: -1 }
-        height: (parent.height - nameSlot.height)/2
-        ListView {
-            model: attributes
-            anchors { fill: parent; margins: 4 }
-            delegate: Text {
-                text: visibility(modelData.visibility) + modelData.name + ": " + (modelData.type ? modelData.type.name:"<no type>")
-                font { family: "Korolev" }
-            }
-        }
-    }
-    UmlSlot {
-        anchors { top: attributeSlot.bottom; topMargin: -1; bottom: parent.bottom }
-        ListView {
-            model: operations
-            anchors { fill: parent; margins: 4 }
-            delegate: Text {
-                text: visibility(modelData.visibility) + modelData.name
-                font { family: "Korolev" }
-            }
-        }
-    }
-    function visibility(visibilityEnum)
-    {
-        switch (visibilityEnum) {
-        case 0: return "+"
-        case 1: return "-"
-        case 2: return "#"
-        case 3: return "~"
-        }
-    }
-}
diff --git a/src/imports/uml/UmlComponent.qml b/src/imports/uml/UmlComponent.qml
deleted file mode 100644
index a0639d5b..00000000
--- a/src/imports/uml/UmlComponent.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtUml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-UmlElement {
-    UmlSlot {
-        id: nameSlot
-        anchors.top: parent.top
-        Text {
-            text: element.name
-            anchors.centerIn: parent
-            font { family: "Korolev"; italic: element.isAbstract }
-        }
-        Rectangle {
-            border.width: 1
-            width: 18; height: 18
-            anchors { right: parent.right; rightMargin: 6; verticalCenter: parent.verticalCenter }
-            Rectangle { border.width: 1; width: 12; height: 5; x: -6; y: 3 }
-            Rectangle { border.width: 1; width: 12; height: 5; x: -6; y: 10 }
-        }
-    }
-    UmlSlot {
-        id: partSlot
-        anchors { top: nameSlot.bottom; topMargin: -1; bottom: parent.bottom }
-    }
-    Row {
-        width: parent.width
-        spacing: (parent.width - 14*ports.length)/(ports.length-1)
-        anchors { bottom: parent.bottom; bottomMargin: -7 }
-        Repeater {
-            model: ports.length
-            Rectangle {
-                border.width: 1
-                width: 14; height: 14
-            }
-        }
-    }
-    Component.onCompleted: {
-        var component = Qt.createComponent("UmlProperty.qml")
-        if (component.status == Component.Ready) {
-            var partLength = parts.length
-            for (var i = 0; i < partLength; ++i) {
-                component.createObject(partSlot, { name: parts[i].name + ":" + parts[i].type.name })
-            }
-        }
-    }
-}
diff --git a/src/imports/uml/UmlElement.qml b/src/imports/uml/UmlElement.qml
deleted file mode 100644
index 03a3d120..00000000
--- a/src/imports/uml/UmlElement.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtUml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Rectangle {
-    id: element
-
-    width: 120
-    height: 80
-
-    // Drag area
-    MouseArea {
-        anchors.fill: parent
-        drag { target: parent; minimumX: 0; minimumY: 0 }
-        onPressed: parent.focus = true
-    }
-
-    // Selection marks (begin)
-    Rectangle {
-        visible: parent.focus; color: "black"; width: 6; height: 6; z: 2
-        anchors { right: parent.right; top: parent.top; rightMargin: -2; topMargin: -2 }
-    }
-    Rectangle {
-        visible: parent.focus; color: "black"; width: 6; height: 6; z: 2
-        anchors { right: parent.right; bottom: parent.bottom; rightMargin: -2; bottomMargin: -2 }
-    }
-    Rectangle {
-        visible: parent.focus; color: "black"; width: 6; height: 6; z: 2
-        anchors { left: parent.left; top: parent.top; leftMargin: -2; topMargin: -2 }
-    }
-    Rectangle {
-        visible: parent.focus; color: "black"; width: 6; height: 6; z: 2
-        anchors { left: parent.left; bottom: parent.bottom; leftMargin: -2; bottomMargin: -2 }
-    }
-    // Selection marks (end)
-
-    // Resize mark
-    Image {
-        id: resizeMark
-        visible: parent.focus
-        source: "resize-mark.png"
-        anchors { right: parent.right; bottom: parent.bottom }
-        z: 1
-        MouseArea {
-            enabled: element.focus
-
-            anchors.fill: parent
-            drag.target: resizeMark
-
-            property int oldMouseX
-            property int oldMouseY
-
-            hoverEnabled: true
-
-            onPressed: {
-                element.focus = true;
-                oldMouseX = mouseX
-                oldMouseY = mouseY
-            }
-
-            onPositionChanged: {
-                if (pressed) {
-                    element.width = Math.max(element.width + (mouseX - oldMouseX), 80)
-                    element.height = Math.max(element.height + (mouseY - oldMouseY), 50)
-                }
-            }
-        }
-    }
-    gradient: Gradient {
-        GradientStop { position: 0.0; color: "#FFFFF5" }
-        GradientStop { position: 1.0; color: "#FFFFE1" }
-    }
-}
diff --git a/src/imports/uml/UmlProperty.qml b/src/imports/uml/UmlProperty.qml
deleted file mode 100644
index 1972afa8..00000000
--- a/src/imports/uml/UmlProperty.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtUml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-UmlElement {
-    width: 60
-    height: 40
-    property alias name: label.text
-    property alias portsLength: repeater.model
-    UmlSlot {
-        anchors { top: parent.top; bottom: parent.bottom }
-        Text {
-            id: label
-            anchors.centerIn: parent
-            font { family: "Korolev"; italic: element.isAbstract }
-        }
-        Rectangle {
-            border.width: 1
-            width: 18; height: 18
-            anchors { right: parent.right; rightMargin: 6; verticalCenter: parent.verticalCenter }
-            Rectangle { border.width: 1; width: 12; height: 5; x: -6; y: 3 }
-            Rectangle { border.width: 1; width: 12; height: 5; x: -6; y: 10 }
-        }
-    }
-    Row {
-        width: parent.width
-        spacing: (parent.width - 14*ports.length)/(ports.length-1)
-        anchors { bottom: parent.bottom; bottomMargin: -7 }
-        Repeater {
-            id: repeater
-            Rectangle {
-                border.width: 1
-                width: 14; height: 14
-            }
-        }
-    }
-}
diff --git a/src/imports/uml/UmlSlot.qml b/src/imports/uml/UmlSlot.qml
deleted file mode 100644
index 23f22ded..00000000
--- a/src/imports/uml/UmlSlot.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org>
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtUml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Rectangle {
-    width: parent.width
-    height: childrenRect.height + 10
-    border { width: 1; color: "black" }
-    clip: true
-    color: "transparent"
-}
diff --git a/src/imports/uml/qmldir b/src/imports/uml/qmldir
deleted file mode 100644
index ddc74ca3..00000000
--- a/src/imports/uml/qmldir
+++ /dev/null
@@ -1,6 +0,0 @@
-module QtModeling.Uml
-internal UmlElement UmlElement.qml
-internal UmlSlot UmlSlot.qml
-UmlClass 1.0 UmlClass.qml
-UmlComponent 1.0 UmlComponent.qml
-UmlProperty 1.0 UmlProperty.qml
diff --git a/src/imports/uml/resize-mark.png b/src/imports/uml/resize-mark.png
deleted file mode 100644
index b3697697..00000000
--- a/src/imports/uml/resize-mark.png
+++ /dev/null
diff --git a/src/imports/uml/uml.pro b/src/imports/uml/uml.pro
deleted file mode 100644
index 0bd6b250..00000000
--- a/src/imports/uml/uml.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGETPATH = QtModeling/Uml
-
-QML_FILES = \
-    resize-mark.png \
-    UmlElement.qml \
-    UmlSlot.qml \
-    UmlClass.qml \
-    UmlComponent.qml \
-    UmlProperty.qml
-
-load(qml_module)
diff --git a/src/plugins/metamodels/duse/duse.pro b/src/plugins/metamodels/duse/duse.pro
index 96653bf1..27f26f20 100644
--- a/src/plugins/metamodels/duse/duse.pro
+++ b/src/plugins/metamodels/duse/duse.pro
@@ -11,7 +11,7 @@ HEADERS = qdusemetamodelplugin.h
 SOURCES = qdusemetamodelplugin.cpp
 
 xmi.files = Duse.xmi
-xmi.path = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
+xmi.path = $${target.path}
 
 INSTALLS += xmi
 
diff --git a/src/plugins/metamodels/mof/mof.pro b/src/plugins/metamodels/mof/mof.pro
index 31a8eb3e..1f36aec0 100644
--- a/src/plugins/metamodels/mof/mof.pro
+++ b/src/plugins/metamodels/mof/mof.pro
@@ -11,7 +11,7 @@ HEADERS = qmofmetamodelplugin.h
 SOURCES = qmofmetamodelplugin.cpp
 
 xmi.files = MOF.xmi PrimitiveTypes.xmi
-xmi.path = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
+xmi.path = $${target.path}
 
 INSTALLS += xmi
 
diff --git a/src/plugins/metamodels/saduseprofile/saduseprofile.pro b/src/plugins/metamodels/saduseprofile/saduseprofile.pro
index 81aed77f..4ab58ef8 100644
--- a/src/plugins/metamodels/saduseprofile/saduseprofile.pro
+++ b/src/plugins/metamodels/saduseprofile/saduseprofile.pro
@@ -11,7 +11,7 @@ HEADERS = qsaduseprofilemetamodelplugin.h
 SOURCES = qsaduseprofilemetamodelplugin.cpp
 
 xmi.files = SADuseProfile.xmi
-xmi.path = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
+xmi.path = $${target.path}
 
 INSTALLS += xmi
 
diff --git a/src/plugins/metamodels/uml/uml.pro b/src/plugins/metamodels/uml/uml.pro
index 417ea9f1..2ddcdc3f 100644
--- a/src/plugins/metamodels/uml/uml.pro
+++ b/src/plugins/metamodels/uml/uml.pro
@@ -11,7 +11,7 @@ HEADERS = qumlmetamodelplugin.h
 SOURCES = qumlmetamodelplugin.cpp
 
 xmi.files = UML.xmi PrimitiveTypes.xmi
-xmi.path = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
+xmi.path = $${target.path}
 
 INSTALLS += xmi