From c7334fbc8c33773231dd9c2e3c843e6a6a764fc5 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Date: Tue, 25 Aug 2015 18:05:45 +0200
Subject: [PATCH] move automatic resource inclusion to pri files
Avoid code duplication.
Change-Id: Icd270ff4e45112111b7eb9590e415947f63ce15b
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
.../qwebenginecookiestoreclient/qwebenginecookiestoreclient.pro | 1 -
.../qwebengineurlrequestinterceptor.pro | 1 -
tests/auto/core/tests.pri | 2 ++
.../widgets/qwebengineaccessibility/qwebengineaccessibility.pro | 1 -
tests/auto/widgets/qwebengineframe/qwebengineframe.pro | 1 -
tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro | 1 -
.../qwebenginehistoryinterface/qwebenginehistoryinterface.pro | 1 -
tests/auto/widgets/qwebengineinspector/qwebengineinspector.pro | 1 -
tests/auto/widgets/qwebenginepage/qwebenginepage.pro | 1 -
tests/auto/widgets/qwebenginescript/qwebenginescript.pro | 1 -
tests/auto/widgets/qwebengineview/qwebengineview.pro | 1 -
tests/auto/widgets/tests.pri | 2 ++
12 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/tests/auto/core/qwebenginecookiestoreclient/qwebenginecookiestoreclient.pro b/tests/auto/core/qwebenginecookiestoreclient/qwebenginecookiestoreclient.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/core/qwebenginecookiestoreclient/qwebenginecookiestoreclient.pro
+++ b/tests/auto/core/qwebenginecookiestoreclient/qwebenginecookiestoreclient.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/qwebengineurlrequestinterceptor.pro b/tests/auto/core/qwebengineurlrequestinterceptor/qwebengineurlrequestinterceptor.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/qwebengineurlrequestinterceptor.pro
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/qwebengineurlrequestinterceptor.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/core/tests.pri b/tests/auto/core/tests.pri
index 35dd94566..d6095c9a3 100644
--- a/tests/auto/core/tests.pri
+++ b/tests/auto/core/tests.pri
@@ -11,5 +11,7 @@ TARGET = tst_$$TARGET
SOURCES += $${TARGET}.cpp
INCLUDEPATH += $$PWD
+exists($${TARGET}.qrc): RESOURCES += $${TARGET}.qrc
+
QT += testlib network webenginewidgets widgets
osx: CONFIG -= app_bundle
diff --git a/tests/auto/widgets/qwebengineaccessibility/qwebengineaccessibility.pro b/tests/auto/widgets/qwebengineaccessibility/qwebengineaccessibility.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/widgets/qwebengineaccessibility/qwebengineaccessibility.pro
+++ b/tests/auto/widgets/qwebengineaccessibility/qwebengineaccessibility.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/widgets/qwebengineframe/qwebengineframe.pro b/tests/auto/widgets/qwebengineframe/qwebengineframe.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/widgets/qwebengineframe/qwebengineframe.pro
+++ b/tests/auto/widgets/qwebengineframe/qwebengineframe.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro b/tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro
+++ b/tests/auto/widgets/qwebenginehistory/qwebenginehistory.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/widgets/qwebenginehistoryinterface/qwebenginehistoryinterface.pro b/tests/auto/widgets/qwebenginehistoryinterface/qwebenginehistoryinterface.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/widgets/qwebenginehistoryinterface/qwebenginehistoryinterface.pro
+++ b/tests/auto/widgets/qwebenginehistoryinterface/qwebenginehistoryinterface.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/widgets/qwebengineinspector/qwebengineinspector.pro b/tests/auto/widgets/qwebengineinspector/qwebengineinspector.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/widgets/qwebengineinspector/qwebengineinspector.pro
+++ b/tests/auto/widgets/qwebengineinspector/qwebengineinspector.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
index e56bbe8f7..70786e70f 100644
--- a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
+++ b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
@@ -1,3 +1,2 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
QT *= core-private gui-private
diff --git a/tests/auto/widgets/qwebenginescript/qwebenginescript.pro b/tests/auto/widgets/qwebenginescript/qwebenginescript.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/widgets/qwebenginescript/qwebenginescript.pro
+++ b/tests/auto/widgets/qwebenginescript/qwebenginescript.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/widgets/qwebengineview/qwebengineview.pro b/tests/auto/widgets/qwebengineview/qwebengineview.pro
index ff6c49628..e99c7f493 100644
--- a/tests/auto/widgets/qwebengineview/qwebengineview.pro
+++ b/tests/auto/widgets/qwebengineview/qwebengineview.pro
@@ -1,2 +1 @@
include(../tests.pri)
-exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
diff --git a/tests/auto/widgets/tests.pri b/tests/auto/widgets/tests.pri
index 8d86ac93e..7d7915b8a 100644
--- a/tests/auto/widgets/tests.pri
+++ b/tests/auto/widgets/tests.pri
@@ -11,6 +11,8 @@ TARGET = tst_$$TARGET
SOURCES += $${TARGET}.cpp
INCLUDEPATH += $$PWD
+exists($${TARGET}.qrc): RESOURCES += $${TARGET}.qrc
+
QT += testlib network webenginewidgets widgets
macx: CONFIG -= app_bundle
--
GitLab