diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-18 15:39:56 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-06-18 17:14:39 +0300 |
| commit | 9b8aa933f41d1858608b1c16f35349b68520bdc8 (patch) | |
| tree | 72199b1e22ee2512a90b4e12c1eafa09c4a5f8d6 | |
| parent | 490bfe3160ab27b73090a668bec4a3db6ad4ac56 (diff) | |
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 <christiaan.janssen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| -rw-r--r-- | qmlprofiler.pro | 2 | ||||
| -rw-r--r-- | qtcreatorlibrary.pri | 8 | ||||
| -rw-r--r-- | qtcreatorplugin.pri | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/qmlprofiler.pro b/qmlprofiler.pro index 55ba4afb4f..70c98b4a86 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 9e525ccfdf..aa11abf700 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 3044256f79..e0ee55580e 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) |