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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc | 2 | ||||
| -rw-r--r-- | examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols2.conf (renamed from examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols.conf) | 0 | ||||
| -rw-r--r-- | examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc | 2 | ||||
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.qrc | 2 | ||||
| -rw-r--r-- | examples/quickcontrols2/gallery/qtquickcontrols2.conf (renamed from examples/quickcontrols2/gallery/qtquickcontrols.conf) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc b/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc index eab2140a..6dcfb073 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc @@ -3,7 +3,7 @@ <file>main.qml</file> <file>ContactPage.qml</file> <file>ConversationPage.qml</file> - <file>qtquickcontrols.conf</file> + <file>qtquickcontrols2.conf</file> <file>ChatToolBar.qml</file> <file>+material/ChatToolBar.qml</file> </qresource> diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols.conf b/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols2.conf index e338c804..e338c804 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols.conf +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols2.conf diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc index e83f84c2..911ea811 100644 --- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc @@ -806,7 +806,7 @@ should be very few adjustments necessary when switching styles. Now let's try each style's dark theme. The Default style has no dark theme, as it would add a slight overhead to a style that is designed to be as performant as possible. We'll test out the Material style first, so add an entry to -\c qtquickcontrols.conf that tells it to use its dark theme: +\c qtquickcontrols2.conf that tells it to use its dark theme: \code [material] diff --git a/examples/quickcontrols2/gallery/gallery.qrc b/examples/quickcontrols2/gallery/gallery.qrc index ee4bf5b7..ba5fb595 100644 --- a/examples/quickcontrols2/gallery/gallery.qrc +++ b/examples/quickcontrols2/gallery/gallery.qrc @@ -1,7 +1,7 @@ <RCC> <qresource prefix="/"> <file>gallery.qml</file> - <file>qtquickcontrols.conf</file> + <file>qtquickcontrols2.conf</file> <file>images/arrow.png</file> <file>images/arrow@2x.png</file> <file>images/arrow@3x.png</file> diff --git a/examples/quickcontrols2/gallery/qtquickcontrols.conf b/examples/quickcontrols2/gallery/qtquickcontrols2.conf index 61375ac1..61375ac1 100644 --- a/examples/quickcontrols2/gallery/qtquickcontrols.conf +++ b/examples/quickcontrols2/gallery/qtquickcontrols2.conf |