diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-10 11:00:47 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-10 10:43:01 +0000 |
| commit | f5af9c4a42f49f66cbccc71a2d13192598285f26 (patch) | |
| tree | 529e2e658a119328a0c76c76dd5f4da506fdd0af | |
| parent | f98f1a09575d4bf2cacace173401d2e14c9f3236 (diff) | |
QtCreator: Remove code for perfparser/perfprofiler and qmlpreview
Part of the main Qt Creator build since 4.9
Change-Id: I9613af366adafcbcf03120b3a445bfd56f5a49e7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | packaging-tools/build_wrapper.py | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 23ecd9834..1ce25f3f1 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -833,7 +833,6 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): has_unlock_keychain_script = os.path.exists(unlock_keychain_script()) # from 4.4 on we use external elfutil builds and also build on Windows elfutils_url = optionDict.get('ELFUTILS_URL') - use_separate_elfutils = bool(elfutils_url) def module_filename(module): return module + '-' + qt_postfix + '.7z' @@ -996,45 +995,6 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): modules=qt_module_local_urls, dependencies=plugin_dependencies + ['b2qt-qtcreator-plugin'], qmake_arguments=qmake_arguments)]), - if not bldinstallercommon.is_mac_platform(): - build_perfparser = False - if use_separate_elfutils: - build_perfparser = True - perfparser_additional_arguments = ['--deploy'] - perfparser_qmake_arguments = ['ELFUTILS_INSTALL_DIR=' + elfutils_path] - if bldinstallercommon.is_linux_platform(): - perfparser_qmake_arguments.extend([ - 'PERFPARSER_APP_DESTDIR=' + os.path.join(work_dir, 'perfparser-target', 'libexec', 'qtcreator'), - 'PERFPARSER_APP_INSTALLDIR=' + os.path.join(work_dir, 'perfparser-target', 'libexec', 'qtcreator'), - 'PERFPARSER_ELFUTILS_INSTALLDIR=' + os.path.join(work_dir, 'perfparser-target', 'lib', 'elfutils'), - 'PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR=' + os.path.join(work_dir, 'perfparser-target', 'lib', 'elfutils')]) - elif bldinstallercommon.is_win_platform(): - perfparser_qmake_arguments.extend([ - 'PERFPARSER_APP_DESTDIR=' + os.path.join(work_dir, 'perfparser-target', 'bin'), - 'PERFPARSER_APP_INSTALLDIR=' + os.path.join(work_dir, 'perfparser-target', 'bin'), - 'PERFPARSER_ELFUTILS_INSTALLDIR=' + os.path.join(work_dir, 'perfparser-target', 'bin'), - 'PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR=' + os.path.join(work_dir, 'perfparser-target', 'lib', 'elfutils')]) - elif bldinstallercommon.is_linux_platform(): - build_perfparser = True - perfparser_additional_arguments = [] - perfparser_qmake_arguments = [ - 'PERFPARSER_BUNDLED_ELFUTILS=true', - 'PERFPARSER_APP_DESTDIR=' + os.path.join(work_dir, 'perfparser-target', 'libexec', 'qtcreator'), - 'PERFPARSER_ELFUTILS_DESTDIR=' + os.path.join(work_dir, 'perfparser-target', 'lib', 'qtcreator'), - 'PERFPARSER_APP_INSTALLDIR=' + os.path.join(work_dir, 'perfparser-target', 'libexec', 'qtcreator'), - 'PERFPARSER_ELFUTILS_INSTALLDIR=' + os.path.join(work_dir, 'perfparser-target', 'lib', 'qtcreator')] - if build_perfparser: - additional_plugins.extend([make_QtcPlugin('perfparser', 'perfparser', qtcreator_version, modules=qt_module_local_urls, - qmake_arguments=perfparser_qmake_arguments, - additional_arguments=perfparser_additional_arguments)]) - additional_plugins.extend([make_QtcPlugin('perfprofiler', 'perfprofiler', qtcreator_version, - modules=qt_module_local_urls, dependencies=plugin_dependencies, - qmake_arguments=qmake_arguments)]) - - # qmlpreview does work on macOs - additional_plugins.extend([make_QtcPlugin('qmlpreview', 'qmlpreview', qtcreator_version, - modules=qt_module_local_urls, dependencies=plugin_dependencies, - qmake_arguments=qmake_arguments)]) # Build Qt Creator plugins icu_local_url = bld_utils.file_url(os.path.join(qtcreator_temp, os.path.basename(icu_libs))) if bldinstallercommon.is_linux_platform() else None |