QmlDesigner: changing the path of plugins

This patch changes the path of QmlDesigner specific plugins on Linux
and Windows.
The path is changed from lib/qmldesigner to lib/qtcreator/qmldesigner.

The plugins use the same plugindestdir.pri now.

Task-number: QTCREATORBUG-5222
Change-Id: I12e874c8501dc7546f924cec950f29b55a837c88
Reviewed-on: http://codereview.qt.nokia.com/4356
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>

src/plugins/qmldesigner/extrasplugin/extrasplugin.pro

@@ -1,4 +1,4 @@
 include(../../../../qtcreator.pri)
 include(../../../private_headers.pri)
 include(extrasplugin.pri)
-include(plugindestdir.pri)
+include(../plugindestdir.pri)

src/plugins/qmldesigner/meegoplugin/meegoplugin.pro

@@ -1,4 +1,4 @@
 include(../../../../qtcreator.pri)
 include(../../../private_headers.pri)
 include(meegoplugin.pri)
-include(plugindestdir.pri)
+include(../plugindestdir.pri)

src/plugins/qmldesigner/meegoplugin/plugindestdir.pri

@@ -1,5 +0,0 @@
-macx {
-  DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
-} else {
-  DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner
-}

src/plugins/qmldesigner/plugindestdir.pri

@@ -1,5 +1,5 @@
 macx {
   DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
 } else {
-  DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner
+  DESTDIR = $$IDE_BUILD_TREE/lib/qtcreator/qmldesigner
 }

src/plugins/qmldesigner/qmldesignerplugin.cpp

@@ -137,7 +137,7 @@ bool BauhausPlugin::initialize(const QStringList & /*arguments*/, QString *error
     const QString pluginPath = QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner";
 #else
     const QString pluginPath = QCoreApplication::applicationDirPath() + "/../"
-                               + QLatin1String(IDE_LIBRARY_BASENAME) + "/qmldesigner";
+                               + QLatin1String(IDE_LIBRARY_BASENAME) + "/qtcreator/qmldesigner";
 #endif
 
     m_designerCore->pluginManager()->setPluginPaths(QStringList() << pluginPath);

src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri

@@ -1,5 +0,0 @@
-macx {
-  DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
-} else {
-  DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner
-}

src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro

@@ -1,4 +1,4 @@
 include(../../../../qtcreator.pri)
 include(../../../private_headers.pri)
 include(qtquickplugin.pri)
-include(plugindestdir.pri)
+include(../plugindestdir.pri)

src/plugins/qmldesigner/symbianplugin/plugindestdir.pri

@@ -1,5 +0,0 @@
-macx {
-  DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
-} else {
-  DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner
-}

src/plugins/qmldesigner/symbianplugin/symbianplugin.pro

@@ -1,4 +1,4 @@
 include(../../../../qtcreator.pri)
 include(../../../private_headers.pri)
 include(symbianplugin.pri)
-include(plugindestdir.pri)
+include(../plugindestdir.pri)