diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-03 20:59:19 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-05-13 04:35:15 +0000 |
| commit | e6f5f57c5349e42e1350b0d5ce2150e0a8743253 (patch) | |
| tree | 84505d5a809d0a1724a64d8125d1e8df93eaf2e1 | |
| parent | c49baa34d710b94d451d3f1165a442d3cb080ad8 (diff) | |
move builtins.qmltypes to an own subdir
shadowing doesn't actually work from within a subdirs project, so we
need to put it into a separate aux project.
it would be possible to put the project file in the same directory, but
then a simple "make qmltypes" wouldn't work due to the different
Makefile name.
Change-Id: Ib90914e4ea5d75f7199399c7e2825690774081c5
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | src/imports/builtins/builtins.pro | 32 | ||||
| -rw-r--r-- | src/imports/builtins/builtins.qmltypes (renamed from src/imports/builtins.qmltypes) | 0 | ||||
| -rw-r--r-- | src/imports/imports.pro | 33 |
3 files changed, 33 insertions, 32 deletions
diff --git a/src/imports/builtins/builtins.pro b/src/imports/builtins/builtins.pro new file mode 100644 index 0000000000..efd6787e5c --- /dev/null +++ b/src/imports/builtins/builtins.pro @@ -0,0 +1,32 @@ +TEMPLATE = aux + +QMLTYPEFILE = builtins.qmltypes + +# install rule +builtins.files = $$QMLTYPEFILE +builtins.path = $$[QT_INSTALL_QML] +INSTALLS += builtins + +# copy to build directory +!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { + defineReplace(qmlModStripSrcDir) { + return($$relative_path($$1, $$_PRO_FILE_PWD_)) + } + + qmltypes2build.input = QMLTYPEFILE + qmltypes2build.output = $$[QT_INSTALL_QML]/${QMAKE_FUNC_FILE_IN_qmlModStripSrcDir} + !contains(TEMPLATE, vc.*): qmltypes2build.variable_out = PRE_TARGETDEPS + qmltypes2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + qmltypes2build.name = COPY ${QMAKE_FILE_IN} + qmltypes2build.CONFIG = no_link no_clean + + QMAKE_EXTRA_COMPILERS += qmltypes2build +} + +# 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.qmltypes b/src/imports/builtins/builtins.qmltypes index cca1c20d54..cca1c20d54 100644 --- a/src/imports/builtins.qmltypes +++ b/src/imports/builtins/builtins.qmltypes diff --git a/src/imports/imports.pro b/src/imports/imports.pro index f7002f9ed5..a63ca0af41 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS += \ + builtins \ qtqml \ folderlistmodel \ localstorage \ @@ -17,35 +18,3 @@ qtHaveModule(quick) { } qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel - - -QMLTYPEFILE = builtins.qmltypes - -# install rule -builtins.files = $$QMLTYPEFILE -builtins.path = $$[QT_INSTALL_QML] -INSTALLS += builtins - -# copy to build directory -!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { - defineReplace(qmlModStripSrcDir) { - return($$relative_path($$1, $$_PRO_FILE_PWD_)) - } - - qmltypes2build.input = QMLTYPEFILE - qmltypes2build.output = $$[QT_INSTALL_QML]/${QMAKE_FUNC_FILE_IN_qmlModStripSrcDir} - !contains(TEMPLATE, vc.*): qmltypes2build.variable_out = PRE_TARGETDEPS - qmltypes2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - qmltypes2build.name = COPY ${QMAKE_FILE_IN} - qmltypes2build.CONFIG = no_link no_clean - - QMAKE_EXTRA_COMPILERS += qmltypes2build -} - -# qmltypes target -!cross_compile:if(build_pass|!debug_and_release) { - qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) - - qmltypes.commands = $$QMLPLUGINDUMP -builtins > $$PWD/$$QMLTYPEFILE - QMAKE_EXTRA_TARGETS += qmltypes -} |