From 98cfcabe8accf733d8ef280889d7be8205a837ad Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 21 Jul 2016 11:13:43 +0200 Subject: Tests: use the new .pro syntax for RESOURCES A .qrc file is no longer mandatory. One can list resources directly in the RESOURCES variable. Change-Id: I06b5ba97ade6fe42f7bd6273ead26dcbeab96bde Reviewed-by: Mitch Curtis --- tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro | 2 +- tests/auto/qquickmaterialstyle/qquickmaterialstyle.qrc | 5 ----- tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro | 2 +- tests/auto/qquickuniversalstyle/qquickuniversalstyle.qrc | 5 ----- 4 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 tests/auto/qquickmaterialstyle/qquickmaterialstyle.qrc delete mode 100644 tests/auto/qquickuniversalstyle/qquickuniversalstyle.qrc diff --git a/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro index eac9bdc4..e4e95ae3 100644 --- a/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro +++ b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro @@ -6,7 +6,7 @@ SOURCES += \ $$PWD/tst_qquickmaterialstyle.cpp RESOURCES += \ - $$PWD/qquickmaterialstyle.qrc + $$PWD/qtquickcontrols2.conf OTHER_FILES += \ $$PWD/data/* diff --git a/tests/auto/qquickmaterialstyle/qquickmaterialstyle.qrc b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.qrc deleted file mode 100644 index 53ba6450..00000000 --- a/tests/auto/qquickmaterialstyle/qquickmaterialstyle.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - qtquickcontrols2.conf - - diff --git a/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro index 83bd19a5..dc81eb9d 100644 --- a/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro +++ b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro @@ -6,7 +6,7 @@ SOURCES += \ $$PWD/tst_qquickuniversalstyle.cpp RESOURCES += \ - $$PWD/qquickuniversalstyle.qrc + $$PWD/qtquickcontrols2.conf OTHER_FILES += \ $$PWD/data/* diff --git a/tests/auto/qquickuniversalstyle/qquickuniversalstyle.qrc b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.qrc deleted file mode 100644 index 53ba6450..00000000 --- a/tests/auto/qquickuniversalstyle/qquickuniversalstyle.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - qtquickcontrols2.conf - - -- cgit v1.2.3