aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-19 09:06:52 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-19 11:06:53 +0000
commit3587d80d5a6f68150ec299ae16b5c4b63758e7f3 (patch)
treec0595c4b90a9b0eb03d6574444757dcb04a6243c /tests
parentf3a648f9a1d644b9f0cea10c7b0c965ca7331048 (diff)
Rename Qt Labs Controls to Qt Quick Controls 2 - config file
Change-Id: I39bf55cc4e07788722fa2a3962a3476495b83dc9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/material/material.qrc2
-rw-r--r--tests/auto/material/qtquickcontrols.conf (renamed from tests/auto/material/qtlabscontrols.conf)0
-rw-r--r--tests/auto/universal/qtquickcontrols.conf (renamed from tests/auto/universal/qtlabscontrols.conf)0
-rw-r--r--tests/auto/universal/universal.qrc2
4 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/material/material.qrc b/tests/auto/material/material.qrc
index 1df3aef9..f1398b2f 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>qtlabscontrols.conf</file>
+ <file>qtquickcontrols.conf</file>
</qresource>
</RCC>
diff --git a/tests/auto/material/qtlabscontrols.conf b/tests/auto/material/qtquickcontrols.conf
index b6c7c87e..b6c7c87e 100644
--- a/tests/auto/material/qtlabscontrols.conf
+++ b/tests/auto/material/qtquickcontrols.conf
diff --git a/tests/auto/universal/qtlabscontrols.conf b/tests/auto/universal/qtquickcontrols.conf
index 8c6dd807..8c6dd807 100644
--- a/tests/auto/universal/qtlabscontrols.conf
+++ b/tests/auto/universal/qtquickcontrols.conf
diff --git a/tests/auto/universal/universal.qrc b/tests/auto/universal/universal.qrc
index 1df3aef9..f1398b2f 100644
--- a/tests/auto/universal/universal.qrc
+++ b/tests/auto/universal/universal.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
- <file>qtlabscontrols.conf</file>
+ <file>qtquickcontrols.conf</file>
</qresource>
</RCC>