diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-03 16:05:06 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-05-20 09:59:35 +0000 |
| commit | 9b1e2cb48e876758070de07c50586e2787f23b67 (patch) | |
| tree | 3bc5f018d8214ff8637bd2e384900039018163e1 /qtcreator.pri | |
| parent | 9efdfde0885a4857cc9780f32e0d5cf787eb8129 (diff) | |
Add script to create a "dev" package, and allow building against it
Collects all the needed data from a source and build directory,
which then can be used instead of a source directory in combination
with an installed Qt Creator, to build plugins.
On Windows and OS X the plugin can still only built in the same
mode (release or debug) as the used Qt Creator install.
Change-Id: I21119cc0681f1a5f657c969f5d1e7a23d69aedfe
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index bd7f4d7409..cfb640a3c1 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -88,7 +88,10 @@ IDE_APP_PATH = $$IDE_BUILD_TREE/bin osx { IDE_APP_TARGET = "Qt Creator" - IDE_APP_BUNDLE = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app + # check if IDE_BUILD_TREE is actually an existing Qt Creator.app, + # for building against a binary package + exists($$IDE_BUILD_TREE/Contents/MacOS/Qt Creator): IDE_APP_BUNDLE = $$IDE_BUILD_TREE + else: IDE_APP_BUNDLE = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app # set output path if not set manually isEmpty(IDE_OUTPUT_PATH): IDE_OUTPUT_PATH = $$IDE_APP_BUNDLE/Contents @@ -145,10 +148,17 @@ osx { } INCLUDEPATH += \ - $$IDE_BUILD_TREE/src \ # for <app/app_version.h> + $$IDE_BUILD_TREE/src \ # for <app/app_version.h> in case of actual build directory + $$IDE_SOURCE_TREE/src \ # for <app/app_version.h> in case of binary package with dev package $$IDE_SOURCE_TREE/src/libs \ $$IDE_SOURCE_TREE/tools +win32:exists($$IDE_SOURCE_TREE/lib/qtcreator) { + # for .lib in case of binary package with dev package + LIBS *= -L$$IDE_SOURCE_TREE/lib/qtcreator + LIBS *= -L$$IDE_SOURCE_TREE/lib/qtcreator/plugins +} + QTC_PLUGIN_DIRS_FROM_ENVIRONMENT = $$(QTC_PLUGIN_DIRS) QTC_PLUGIN_DIRS += $$split(QTC_PLUGIN_DIRS_FROM_ENVIRONMENT, $$QMAKE_DIRLIST_SEP) QTC_PLUGIN_DIRS += $$IDE_SOURCE_TREE/src/plugins |