diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-23 11:31:07 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-04-23 12:01:55 +0200 |
| commit | 0877ac713c7ec1502137541d52602f3c692f8238 (patch) | |
| tree | e0a26fff6bce8e572267d1abaf369a284c57bb6b /src/app | |
| parent | 5fd4348bd8a21e4d5c4a63f609c46d2380a37d75 (diff) | |
Adapt apps project files to be better embeddable in other projects.
Change-Id: I785bf772facf06e421754a07cce45c4b94e30196
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/app.pri | 11 | ||||
| -rw-r--r-- | src/app/apps.qbs | 1 | ||||
| -rw-r--r-- | src/app/apptemplate.qbs | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/app/app.pri b/src/app/app.pri index 8dc6dc95b..3a86e5a0f 100644 --- a/src/app/app.pri +++ b/src/app/app.pri @@ -1,6 +1,12 @@ QT = core TEMPLATE = app -DESTDIR = ../../../bin +!isEmpty(QBS_APPS_DESTDIR):DESTDIR = $${QBS_APPS_DESTDIR} +else:DESTDIR = ../../../bin + +!isEmpty(QBS_APPS_RPATH_DIR) { + linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${QBS_APPS_RPATH_DIR}\' + macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR} +} CONFIG += console CONFIG -= app_bundle @@ -8,5 +14,6 @@ CONFIG -= app_bundle include($${PWD}/../lib/corelib/use_corelib.pri) include($${PWD}/shared/logging/logging.pri) -target.path = $${QBS_INSTALL_PREFIX}/bin +!isEmpty(QBS_APPS_INSTALL_DIR):target.path = $${QBS_APPS_INSTALL_DIR} +else:target.path = $${QBS_INSTALL_PREFIX}/bin INSTALLS += target diff --git a/src/app/apps.qbs b/src/app/apps.qbs index 56d8d3289..f3a87f81e 100644 --- a/src/app/apps.qbs +++ b/src/app/apps.qbs @@ -1,6 +1,7 @@ import qbs Project { + property string appInstallDir: "bin" references: [ "config/config.qbs", "config-ui/config-ui.qbs", diff --git a/src/app/apptemplate.qbs b/src/app/apptemplate.qbs index 2d87a0233..7ebe33b2d 100644 --- a/src/app/apptemplate.qbs +++ b/src/app/apptemplate.qbs @@ -13,7 +13,7 @@ Product { Group { fileTagsFilter: product.type qbs.install: true - qbs.installDir: "bin" + qbs.installDir: project.appInstallDir } Group { name: "logging" |