diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-31 10:47:06 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-31 10:05:25 +0000 |
| commit | ac0f014d652b1ac09a0d4702d258fb8055a0fd97 (patch) | |
| tree | 3769cde9d753816045bb972979c9771cef7ffd38 /packaging-tools/bld_qtcreator.py | |
| parent | ac54774cecb3fabd21e28081a29d3a38e8b5d076 (diff) | |
Qt Creator: Fix build of perf parser for 4.9
The separate plugin is gone, and we have to specify the details for
elfutils for the main Qt Creator repository build.
Change-Id: Ia78543fad1a11e6c19bf72f53a8f6e25b96458a6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'packaging-tools/bld_qtcreator.py')
| -rwxr-xr-x | packaging-tools/bld_qtcreator.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py index abf18654f..2dbe4daf8 100755 --- a/packaging-tools/bld_qtcreator.py +++ b/packaging-tools/bld_qtcreator.py @@ -65,6 +65,7 @@ def add_commandline_arguments(parser): parser.add_argument('--python_path', help="path to python libraries for use by cdbextension") parser.add_argument('--skip_cdb', help="skip cdbextension and the python dependency packaging step", action='store_true', default=False) + parser.add_argument('--elfutils_path', help='elfutils installation path for use by perfprofiler') def add_common_commandline_arguments(parser): if bldinstallercommon.is_win_platform(): @@ -263,6 +264,17 @@ if __name__ == "__main__": 'CONFIG+=force_debug_info', 'CONFIG+=separate_debug_info'] + # perfparser for Qt Creator >= 4.9 + if callerArguments.elfutils_path: + qmakeCommand.append('ELFUTILS_INSTALL_DIR=' + callerArguments.elfutils_path) + if bldinstallercommon.is_linux_platform(): + elfutils_install_path = qtCreatorInstallDirectory + '/lib/elfutils' + qmakeCommand.append('PERFPARSER_ELFUTILS_INSTALLDIR=' + elfutils_install_path) + qmakeCommand.append('PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR=' + elfutils_install_path) + if bldinstallercommon.is_win_platform(): + qmakeCommand.append('PERFPARSER_ELFUTILS_INSTALLDIR=' + qtCreatorInstallDirectory + '/bin') + qmakeCommand.append('PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR=' + qtCreatorInstallDirectory + '/lib/elfutils') + if bldinstallercommon.is_mac_platform(): qmakeCommand.append('QMAKE_MAC_SDK=macosx') # work around QTBUG-41238 |