diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-27 20:46:09 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-27 20:53:00 +0200 |
commit | df946a834f6c7d7b9513fb71dc2a93ff148d5a1f (patch) | |
tree | 215ffb3e3716db58360bcc1b09f36f49d5d2bf00 /tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc | |
parent | 2568869819863de6b1f303dfe470aedf38b841c3 (diff) | |
parent | 67f67f2cc6de160ddea4aa76afc56e86415ed99b (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I10fadb2673912436340b485d8a738e1ae65d629e
Diffstat (limited to 'tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc')
-rw-r--r-- | tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc b/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc new file mode 100644 index 00000000..53ba6450 --- /dev/null +++ b/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>qtquickcontrols2.conf</file> +</qresource> +</RCC> |