diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-07-17 11:42:02 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-07-18 08:09:36 +0000 |
| commit | be8fe2e352eeda57c498d1450634e358c64e04ed (patch) | |
| tree | b7dad38991e8f71ecf2c4113ceea153730256377 /tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml | |
| parent | d96bd6069c6d24c12f0a3d96466e50b4d1a09ac4 (diff) | |
tst_qquickstyle: avoid conflicts with other tests
qrcStylePaths() uses :/qrcStyles1 and :/qrcStyles2, which conflicts
with qrcInQtQuickControlsStylePathEnvVar() in a way that would require
us (qrcInQtQuickControlsStylePathEnvVar()) to be aware of tests that
ran before us.
Avoid this issue by adding more qrc-based styles.
Change-Id: I7a5e24f4ea532c19db30d240fe7c077ac2a09a4e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml')
| -rw-r--r-- | tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml new file mode 100644 index 00000000..5b08222c --- /dev/null +++ b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates 2.0 as T +T.Button { } |