diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-10 16:43:00 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-11 12:12:54 +0000 |
| commit | 58596e8ebbda8b5f086b9e1b29716181a4239433 (patch) | |
| tree | 30464683f41c0d381d01c751943c1d0a91163ced | |
| parent | 4e1c2ac86179f8ff524468aa7fccfabc656a238a (diff) | |
tst_material/universal: use the appropriate style
The main purpose of these tests were to test the attached property
and its inheritance, so it didn't matter which particular style was
active while running the tests. However, it simply looks better if
they run with the appropriate style, and this also allows us to add
style-specific tests (such as font attributes).
Change-Id: I827f26e469bce3445ffe7e24d6299bcfb587d849
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| -rw-r--r-- | tests/auto/material/material.pro | 3 | ||||
| -rw-r--r-- | tests/auto/material/material.qrc | 5 | ||||
| -rw-r--r-- | tests/auto/material/qtlabscontrols.conf | 2 | ||||
| -rw-r--r-- | tests/auto/universal/qtlabscontrols.conf | 2 | ||||
| -rw-r--r-- | tests/auto/universal/universal.pro | 3 | ||||
| -rw-r--r-- | tests/auto/universal/universal.qrc | 5 |
6 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/material/material.pro b/tests/auto/material/material.pro index acd16cab..52663fdc 100644 --- a/tests/auto/material/material.pro +++ b/tests/auto/material/material.pro @@ -5,6 +5,9 @@ CONFIG += qmltestcase SOURCES += \ $$PWD/tst_material.cpp +RESOURCES += \ + $$PWD/material.qrc + OTHER_FILES += \ $$PWD/data/* diff --git a/tests/auto/material/material.qrc b/tests/auto/material/material.qrc new file mode 100644 index 00000000..1df3aef9 --- /dev/null +++ b/tests/auto/material/material.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>qtlabscontrols.conf</file> +</qresource> +</RCC> diff --git a/tests/auto/material/qtlabscontrols.conf b/tests/auto/material/qtlabscontrols.conf new file mode 100644 index 00000000..b6c7c87e --- /dev/null +++ b/tests/auto/material/qtlabscontrols.conf @@ -0,0 +1,2 @@ +[Controls] +Style=Material diff --git a/tests/auto/universal/qtlabscontrols.conf b/tests/auto/universal/qtlabscontrols.conf new file mode 100644 index 00000000..8c6dd807 --- /dev/null +++ b/tests/auto/universal/qtlabscontrols.conf @@ -0,0 +1,2 @@ +[Controls] +Style=Universal diff --git a/tests/auto/universal/universal.pro b/tests/auto/universal/universal.pro index 3a21957c..bb7a85ca 100644 --- a/tests/auto/universal/universal.pro +++ b/tests/auto/universal/universal.pro @@ -5,6 +5,9 @@ CONFIG += qmltestcase SOURCES += \ $$PWD/tst_universal.cpp +RESOURCES += \ + $$PWD/universal.qrc + OTHER_FILES += \ $$PWD/data/* diff --git a/tests/auto/universal/universal.qrc b/tests/auto/universal/universal.qrc new file mode 100644 index 00000000..1df3aef9 --- /dev/null +++ b/tests/auto/universal/universal.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>qtlabscontrols.conf</file> +</qresource> +</RCC> |