diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-27 09:58:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-27 09:58:33 +0200 |
| commit | 01fa9be55572ddb3f69befc68475ed09241eabdf (patch) | |
| tree | 03e177b36123aaf32b287eda215014e08b3d269b /Source/WebKit/qt/declarative | |
| parent | 2e8517924b70a778463e463873eb3d8d0b623eed (diff) | |
| parent | a750b262b856178eee47d546944bd095662dccf7 (diff) | |
| download | qtwebkit-5.7.0.tar.gz | |
Merge remote-tracking branch 'origin/5.6.1' into 5.7.05.7.0
Change-Id: Id8fd457ab1eb501f8f5622cb5f7d88c352e3758f
Diffstat (limited to 'Source/WebKit/qt/declarative')
| -rw-r--r-- | Source/WebKit/qt/declarative/experimental/experimental.pri | 11 | ||||
| -rw-r--r-- | Source/WebKit/qt/declarative/public.pri | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri index 547e66bcc..c59f4569e 100644 --- a/Source/WebKit/qt/declarative/experimental/experimental.pri +++ b/Source/WebKit/qt/declarative/experimental/experimental.pri @@ -11,14 +11,9 @@ TARGET.module_name = QtWebKit/experimental CONFIG += plugin -QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir -copy2build.input = QMLDIRFILE -copy2build.output = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}/qmldir -!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS -copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy2build.name = COPY ${QMAKE_FILE_IN} -copy2build.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy2build +cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir +cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} +COPIES += cpqmldir contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri index d669162e4..bdef38045 100644 --- a/Source/WebKit/qt/declarative/public.pri +++ b/Source/WebKit/qt/declarative/public.pri @@ -11,14 +11,9 @@ TARGET.module_name = QtWebKit CONFIG += plugin -QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir -copy2build.input = QMLDIRFILE -copy2build.output = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}/qmldir -!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS -copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy2build.name = COPY ${QMAKE_FILE_IN} -copy2build.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += copy2build +cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir +cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} +COPIES += cpqmldir contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols |