summaryrefslogtreecommitdiff
path: root/Source/WebKit/qt/declarative/public.pri
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-16 22:19:17 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-16 22:19:17 +0200
commitbdb53d77d1806a06646d3721c22b40ecd03d6f6a (patch)
tree1f8f20fb068753fa3c6f1af3bc1b18a57a54bf75 /Source/WebKit/qt/declarative/public.pri
parent5079a4fb1da63f00d089eac0d40a88bb0e0e45a4 (diff)
parent8b24887dcb8e9ea1fd1b4043795a54bb3d6d3663 (diff)
downloadqtwebkit-bdb53d77d1806a06646d3721c22b40ecd03d6f6a.tar.gz
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ib5bd1f44e83e29501eaa432ddb47320375f5079a
Diffstat (limited to 'Source/WebKit/qt/declarative/public.pri')
-rw-r--r--Source/WebKit/qt/declarative/public.pri11
1 files changed, 3 insertions, 8 deletions
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