diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-21 11:13:43 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-21 10:06:31 +0000 |
| commit | 98cfcabe8accf733d8ef280889d7be8205a837ad (patch) | |
| tree | 19e8a4bf3f34281956dfc3a0ee91082432a4697e | |
| parent | 5690e86326841aff8ff45516dfcbf1d7218c8a1d (diff) | |
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 <mitch.curtis@qt.io>
4 files changed, 2 insertions, 12 deletions
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 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>qtquickcontrols2.conf</file> -</qresource> -</RCC> 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 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>qtquickcontrols2.conf</file> -</qresource> -</RCC> |