From bb43bca1664721401c3a2c25b585913bb5e8cb4f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 Aug 2016 10:02:51 +0200 Subject: Prospective build fix for Windows Similar to commit 770a0c91f3fadcdb132d9eb96d085aafbe1bacd0 in qtbase we may need a heuristic for the COPIES assignment for the qmldir file to protect against copying the same file twice to the same location on debug-and-release builds on Windows. Change-Id: I60d34d218856a70c242824b9253d229d2d33d48d Reviewed-by: Oswald Buddenhagen --- Source/WebKit/qt/declarative/experimental/experimental.pri | 8 +++++--- Source/WebKit/qt/declarative/public.pri | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri index c59f4569e..c4d7002e4 100644 --- a/Source/WebKit/qt/declarative/experimental/experimental.pri +++ b/Source/WebKit/qt/declarative/experimental/experimental.pri @@ -11,9 +11,11 @@ TARGET.module_name = QtWebKit/experimental CONFIG += plugin -cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir -cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} -COPIES += cpqmldir +!debug_and_release|!build_all|CONFIG(release, debug|release) { + 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 bdef38045..3c7d07a05 100644 --- a/Source/WebKit/qt/declarative/public.pri +++ b/Source/WebKit/qt/declarative/public.pri @@ -11,9 +11,11 @@ TARGET.module_name = QtWebKit CONFIG += plugin -cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir -cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} -COPIES += cpqmldir +!debug_and_release|!build_all|CONFIG(release, debug|release) { + 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 -- cgit v1.2.1