diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-30 10:59:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-30 11:01:24 +0200 |
| commit | 5c77df1268f717a9ca666313acfd90e16930a8e4 (patch) | |
| tree | fa3ca51c93ef36b5d07aef2c12e2ca685c02dbc4 /qtcreator.pri | |
| parent | e2d0960d7705a06ffdfeb87869e2ad98e6400aed (diff) | |
| parent | 6dca1499ac867a3a66d5d1210918ec1f8ff0652c (diff) | |
| download | qt-creator-5c77df1268f717a9ca666313acfd90e16930a8e4.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Conflicts:
qtcreator.pri
Change-Id: I87576b71cee9f2f4eb856531f1a8816b1d3738db
Diffstat (limited to 'qtcreator.pri')
| -rw-r--r-- | qtcreator.pri | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index c34143803c..69ee0696ea 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -73,29 +73,46 @@ isEmpty(IDE_BUILD_TREE) { IDE_BUILD_TREE = $$clean_path($$OUT_PWD) IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,, } + IDE_APP_PATH = $$IDE_BUILD_TREE/bin -macx { +osx { IDE_APP_TARGET = "Qt Creator" - IDE_LIBRARY_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Frameworks - IDE_PLUGIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/PlugIns - IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources - IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources + + 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 + + IDE_LIBRARY_PATH = $$IDE_OUTPUT_PATH/Frameworks + IDE_PLUGIN_PATH = $$IDE_OUTPUT_PATH/PlugIns + IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/Resources + IDE_DATA_PATH = $$IDE_OUTPUT_PATH/Resources IDE_DOC_PATH = $$IDE_DATA_PATH/doc - IDE_BIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS + IDE_BIN_PATH = $$IDE_OUTPUT_PATH/MacOS copydata = 1 + + LINK_LIBRARY_PATH = $$IDE_APP_BUNDLE/Contents/Frameworks + LINK_PLUGIN_PATH = $$IDE_APP_BUNDLE/Contents/PlugIns } else { contains(TEMPLATE, vc.*):vcproj = 1 IDE_APP_TARGET = qtcreator - IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator + + # target output path if not set manually + isEmpty(IDE_OUTPUT_PATH): IDE_OUTPUT_PATH = $$IDE_BUILD_TREE + + IDE_LIBRARY_PATH = $$IDE_OUTPUT_PATH/$$IDE_LIBRARY_BASENAME/qtcreator IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins - IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator - IDE_DOC_PATH = $$IDE_BUILD_TREE/share/doc/qtcreator - IDE_BIN_PATH = $$IDE_APP_PATH + IDE_DATA_PATH = $$IDE_OUTPUT_PATH/share/qtcreator + IDE_DOC_PATH = $$IDE_OUTPUT_PATH/share/doc/qtcreator + IDE_BIN_PATH = $$IDE_OUTPUT_PATH/bin win32: \ - IDE_LIBEXEC_PATH = $$IDE_APP_PATH + IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin else: \ - IDE_LIBEXEC_PATH = $$IDE_BUILD_TREE/libexec/qtcreator - !isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1 + IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/qtcreator + !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1 + + LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator + LINK_PLUGIN_PATH = $$LINK_LIBRARY_PATH/plugins INSTALL_LIBRARY_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator INSTALL_PLUGIN_PATH = $$INSTALL_LIBRARY_PATH/plugins @@ -124,7 +141,8 @@ CONFIG += \ depend_includepath \ no_include_pwd -LIBS += -L$$IDE_LIBRARY_PATH +LIBS *= -L$$LINK_LIBRARY_PATH # Qt Creator libraries +exists($$IDE_LIBRARY_PATH): LIBS *= -L$$IDE_LIBRARY_PATH # library path from output path !isEmpty(vcproj) { DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\" @@ -162,7 +180,11 @@ qt { QBSFILE = $$replace(_PRO_FILE_, \\.pro$, .qbs) exists($$QBSFILE):DISTFILES += $$QBSFILE -!isEmpty(QTC_PLUGIN_DEPENDS):LIBS *= -L$$IDE_PLUGIN_PATH +!isEmpty(QTC_PLUGIN_DEPENDS) { + LIBS *= -L$$IDE_PLUGIN_PATH # plugin path from output directory + LIBS *= -L$$LINK_PLUGIN_PATH # when output path is different from Qt Creator build directory +} + # recursively resolve plugin deps done_plugins = for(ever) { |