From 9b8aa933f41d1858608b1c16f35349b68520bdc8 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 18 Jun 2013 15:39:56 +0200 Subject: [PATCH] Make plugin compatible with other extra plugins. So the build script can unconditionally call export QTC_BUILD=foo export QTC_SOURCE=bar qmake -r QTC_PREFIX=/baz CONFIG+=release make docs make install make install_docs Change-Id: I77bf458b980eb45896d02df5a2c5c0cdc28749d1 Reviewed-by: Christiaan Janssen Reviewed-by: Kai Koehne --- qmlprofiler.pro | 2 ++ qtcreatorlibrary.pri | 8 ++++---- qtcreatorplugin.pri | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/qmlprofiler.pro b/qmlprofiler.pro index 55ba4afb4f3..70c98b4a86c 100644 --- a/qmlprofiler.pro +++ b/qmlprofiler.pro @@ -4,3 +4,5 @@ CONFIG += ordered SUBDIRS += libs/qmldebug \ plugins/qmlprofiler \ plugins/qmlprofilerextended + +QMAKE_EXTRA_TARGETS = docs install_docs # dummy targets for consistency diff --git a/qtcreatorlibrary.pri b/qtcreatorlibrary.pri index 9e525ccfdf2..aa11abf7005 100644 --- a/qtcreatorlibrary.pri +++ b/qtcreatorlibrary.pri @@ -1,7 +1,7 @@ -IDE_SOURCE_TREE=$$(IDE_SOURCE_TREE) -IDE_BUILD_TREE=$$(IDE_BUILD_TREE) +IDE_SOURCE_TREE=$$(QTC_SOURCE) +IDE_BUILD_TREE=$$(QTC_BUILD) -isEmpty(IDE_SOURCE_TREE):error(Set IDE_SOURCE_TREE environment variable) -isEmpty(IDE_BUILD_TREE):error(Set IDE_BUILD_TREE environment variable) +isEmpty(IDE_SOURCE_TREE):error(Set QTC_SOURCE environment variable) +isEmpty(IDE_BUILD_TREE):error(Set QTC_BUILD environment variable) include($$IDE_SOURCE_TREE/src/qtcreatorlibrary.pri) diff --git a/qtcreatorplugin.pri b/qtcreatorplugin.pri index 3044256f794..e0ee55580ed 100644 --- a/qtcreatorplugin.pri +++ b/qtcreatorplugin.pri @@ -1,8 +1,8 @@ -IDE_SOURCE_TREE=$$(IDE_SOURCE_TREE) -IDE_BUILD_TREE=$$(IDE_BUILD_TREE) +IDE_SOURCE_TREE=$$(QTC_SOURCE) +IDE_BUILD_TREE=$$(QTC_BUILD) -isEmpty(IDE_SOURCE_TREE):error(Set IDE_SOURCE_TREE environment variable) -isEmpty(IDE_BUILD_TREE):error(Set IDE_BUILD_TREE environment variable) +isEmpty(IDE_SOURCE_TREE):error(Set QTC_SOURCE environment variable) +isEmpty(IDE_BUILD_TREE):error(Set QTC_BUILD environment variable) INCLUDEPATH+=$$PWD/libs $$PWD/plugins include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri)