From 7667e6d77928088739e8f8dcd0307b25bf77b150 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 7 Sep 2011 14:33:42 +0200 Subject: [PATCH] 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 --- src/plugins/qmldesigner/extrasplugin/extrasplugin.pro | 2 +- src/plugins/qmldesigner/meegoplugin/meegoplugin.pro | 2 +- src/plugins/qmldesigner/meegoplugin/plugindestdir.pri | 5 ----- src/plugins/qmldesigner/{extrasplugin => }/plugindestdir.pri | 2 +- src/plugins/qmldesigner/qmldesignerplugin.cpp | 2 +- src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri | 5 ----- src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro | 2 +- src/plugins/qmldesigner/symbianplugin/plugindestdir.pri | 5 ----- src/plugins/qmldesigner/symbianplugin/symbianplugin.pro | 2 +- 9 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 src/plugins/qmldesigner/meegoplugin/plugindestdir.pri rename src/plugins/qmldesigner/{extrasplugin => }/plugindestdir.pri (52%) delete mode 100644 src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri delete mode 100644 src/plugins/qmldesigner/symbianplugin/plugindestdir.pri diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro index 8fffeb67761..af910266b49 100644 --- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro +++ b/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) diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pro b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pro index 7781017a17d..c7cfce0689d 100644 --- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pro +++ b/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) diff --git a/src/plugins/qmldesigner/meegoplugin/plugindestdir.pri b/src/plugins/qmldesigner/meegoplugin/plugindestdir.pri deleted file mode 100644 index 24f0c19b72b..00000000000 --- a/src/plugins/qmldesigner/meegoplugin/plugindestdir.pri +++ /dev/null @@ -1,5 +0,0 @@ -macx { - DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner -} else { - DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner -} diff --git a/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri b/src/plugins/qmldesigner/plugindestdir.pri similarity index 52% rename from src/plugins/qmldesigner/extrasplugin/plugindestdir.pri rename to src/plugins/qmldesigner/plugindestdir.pri index 24f0c19b72b..40e0c95afd9 100644 --- a/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri +++ b/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 } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 5eeb536f187..296118256da 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/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); diff --git a/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri b/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri deleted file mode 100644 index 24f0c19b72b..00000000000 --- a/src/plugins/qmldesigner/qtquickplugin/plugindestdir.pri +++ /dev/null @@ -1,5 +0,0 @@ -macx { - DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner -} else { - DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner -} diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro index 550e1786aff..b694f9a05f6 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pro +++ b/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) diff --git a/src/plugins/qmldesigner/symbianplugin/plugindestdir.pri b/src/plugins/qmldesigner/symbianplugin/plugindestdir.pri deleted file mode 100644 index 24f0c19b72b..00000000000 --- a/src/plugins/qmldesigner/symbianplugin/plugindestdir.pri +++ /dev/null @@ -1,5 +0,0 @@ -macx { - DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner -} else { - DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner -} diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pro b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pro index 6ff795d27a4..b8ea7d042ad 100644 --- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pro +++ b/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)