diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-05-18 19:18:01 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-05-19 08:36:41 +0200 |
| commit | e9d65fca1e3c7d948f1560ec343d3d4f9bceb73a (patch) | |
| tree | ee7ebc36c17c93c3bdcd9787287fccddd0a634fe /src/imports/builtins | |
| parent | 19ea4e630c70cdab1f7eec4f1a8f278df8915720 (diff) | |
Don't use qmlplugindump for builtins.qmltypes anymore
The current contents of builtins.qmltypes should really be part of
QtQml, and builtins.qmltypes should contain actual builtin types
instead. qmlplugindump is only run explicitly on "make qmltypes" anyway,
it's pointless here.
Change-Id: I026fb8b223e5b481cc9150d14dfb0af1aab32b51
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/imports/builtins')
| -rw-r--r-- | src/imports/builtins/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/imports/builtins/builtins.pro | 8 | ||||
| -rw-r--r-- | src/imports/builtins/builtins.qmltypes | 3 |
3 files changed, 0 insertions, 18 deletions
diff --git a/src/imports/builtins/CMakeLists.txt b/src/imports/builtins/CMakeLists.txt index 00b6b07f0b..40f1948144 100644 --- a/src/imports/builtins/CMakeLists.txt +++ b/src/imports/builtins/CMakeLists.txt @@ -9,11 +9,4 @@ qt_copy_or_install(FILES ${qml_type_file} DESTINATION ${qml_install_dir} ) -if (NOT CMAKE_CROSSCOMPILING) - - add_custom_target(builtins_qmltypes - COMMAND qmlplugindump -builtins > ${CMAKE_CURRENT_SOURCE_DIR}/${qml_type_file} - ) -endif() - # special case end diff --git a/src/imports/builtins/builtins.pro b/src/imports/builtins/builtins.pro index 112555b6de..ea326b4e76 100644 --- a/src/imports/builtins/builtins.pro +++ b/src/imports/builtins/builtins.pro @@ -9,11 +9,3 @@ INSTALLS += builtins # copy to build directory !prefix_build: COPIES += builtins - -# qmltypes target -!cross_compile:if(build_pass|!debug_and_release) { - qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) - - qmltypes.commands = $$QMLPLUGINDUMP -builtins > $$PWD/$$QMLTYPEFILE - QMAKE_EXTRA_TARGETS += qmltypes -} diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes index d3897c7b95..0e6ea66abc 100644 --- a/src/imports/builtins/builtins.qmltypes +++ b/src/imports/builtins/builtins.qmltypes @@ -2,9 +2,6 @@ import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. -// -// This file was auto-generated by: -// 'qmlplugindump -builtins' Module { dependencies: [] |