diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-20 22:41:57 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 05:43:19 +0000 |
| commit | e358a033d46056d646c27c09cf956c9699e5ff75 (patch) | |
| tree | 90463f6c3ff231834804ec46d79f561882ed17cc /tests/auto/material | |
| parent | 05f6b386f9e49d263c47a1b5cce668bbc964f32e (diff) | |
Rename qtquickcontrols.conf to qtquickcontrols2.conf
Use the 2-suffix consistently everywhere to avoid any potential
confusion with the old controls.
Change-Id: I83aa212a15ed78b8694fb7d3db80fc8430aea969
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/auto/material')
| -rw-r--r-- | tests/auto/material/material.qrc | 2 | ||||
| -rw-r--r-- | tests/auto/material/qtquickcontrols2.conf (renamed from tests/auto/material/qtquickcontrols.conf) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/material/material.qrc b/tests/auto/material/material.qrc index f1398b2f..53ba6450 100644 --- a/tests/auto/material/material.qrc +++ b/tests/auto/material/material.qrc @@ -1,5 +1,5 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> - <file>qtquickcontrols.conf</file> + <file>qtquickcontrols2.conf</file> </qresource> </RCC> diff --git a/tests/auto/material/qtquickcontrols.conf b/tests/auto/material/qtquickcontrols2.conf index b6c7c87e..b6c7c87e 100644 --- a/tests/auto/material/qtquickcontrols.conf +++ b/tests/auto/material/qtquickcontrols2.conf |