diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-19 09:06:52 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-19 11:06:53 +0000 |
| commit | 3587d80d5a6f68150ec299ae16b5c4b63758e7f3 (patch) | |
| tree | c0595c4b90a9b0eb03d6574444757dcb04a6243c /examples | |
| parent | f3a648f9a1d644b9f0cea10c7b0c965ca7331048 (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 'examples')
| -rw-r--r-- | examples/controls/chattutorial/chapter5-styling/qml.qrc | 2 | ||||
| -rw-r--r-- | examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf (renamed from examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf) | 0 | ||||
| -rw-r--r-- | examples/controls/gallery/gallery.qrc | 2 | ||||
| -rw-r--r-- | examples/controls/gallery/qtquickcontrols.conf (renamed from examples/controls/gallery/qtlabscontrols.conf) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/examples/controls/chattutorial/chapter5-styling/qml.qrc b/examples/controls/chattutorial/chapter5-styling/qml.qrc index d2446409..eab2140a 100644 --- a/examples/controls/chattutorial/chapter5-styling/qml.qrc +++ b/examples/controls/chattutorial/chapter5-styling/qml.qrc @@ -3,7 +3,7 @@ <file>main.qml</file> <file>ContactPage.qml</file> <file>ConversationPage.qml</file> - <file>qtlabscontrols.conf</file> + <file>qtquickcontrols.conf</file> <file>ChatToolBar.qml</file> <file>+material/ChatToolBar.qml</file> </qresource> diff --git a/examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf b/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf index e338c804..e338c804 100644 --- a/examples/controls/chattutorial/chapter5-styling/qtlabscontrols.conf +++ b/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf diff --git a/examples/controls/gallery/gallery.qrc b/examples/controls/gallery/gallery.qrc index e29c18ce..1b74b434 100644 --- a/examples/controls/gallery/gallery.qrc +++ b/examples/controls/gallery/gallery.qrc @@ -1,7 +1,7 @@ <RCC> <qresource prefix="/"> <file>gallery.qml</file> - <file>qtlabscontrols.conf</file> + <file>qtquickcontrols.conf</file> <file>images/arrow.png</file> <file>images/arrow@2x.png</file> <file>images/arrow@3x.png</file> diff --git a/examples/controls/gallery/qtlabscontrols.conf b/examples/controls/gallery/qtquickcontrols.conf index 61375ac1..61375ac1 100644 --- a/examples/controls/gallery/qtlabscontrols.conf +++ b/examples/controls/gallery/qtquickcontrols.conf |