diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-23 16:11:50 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-24 14:00:39 +0200 |
| commit | 8ae479a8eac7b9ffeeba24e9e459e3e02ca20587 (patch) | |
| tree | d6fdf18ddd2456835c598f40399348d247af6c97 /src/imports | |
| parent | 1337e0d0827e86591e67a6dbaaeb3bd3f9ed733b (diff) | |
| parent | 607320ca9fb2796a5f6f2578578fd314f7e8b99e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4runtime_p.h
src/qml/qml/qqmldelayedcallqueue.cpp
src/qml/qml/qqmlvaluetypewrapper.cpp
src/qml/qml/qqmlvmemetaobject.cpp
src/qml/qml/v8/qv8engine_p.h
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I3f0608c7beb88088cbbef4d0db59920f56deaea9
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/builtins/builtins.pro | 19 | ||||
| -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, 20 insertions, 32 deletions
diff --git a/src/imports/builtins/builtins.pro b/src/imports/builtins/builtins.pro new file mode 100644 index 0000000000..112555b6de --- /dev/null +++ b/src/imports/builtins/builtins.pro @@ -0,0 +1,19 @@ +TEMPLATE = aux + +QMLTYPEFILE = builtins.qmltypes + +# install rule +builtins.files = $$QMLTYPEFILE +builtins.path = $$[QT_INSTALL_QML] +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.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 ff7b6e75af..5332fb0ef2 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS += \ + builtins \ qtqml \ folderlistmodel \ localstorage \ @@ -18,35 +19,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 -} |