diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-08 18:14:31 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-09 13:44:30 +0300 |
| commit | d7f5ff363f20e66170f0407f1859728dcb5940e4 (patch) | |
| tree | 4b3d45efcc56388b478d504ef5e7fd4d38aadd9f | |
| parent | d6979299a7809e5b832738c4cf39bba2c9a185eb (diff) | |
Update demos after the upstream merge of enterprise controls
The enterprise controls are now located in the upstream
qtquickcontrols repository and are called Qt Quick Extras.
This patch also re-enables the gallery demo.
Change-Id: I828d4b2aa1a35270dd4036580a6a645e09fbc391
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| -rw-r--r-- | basicsuite/enterprise-dashboard/description.txt | 2 | ||||
| -rw-r--r-- | basicsuite/enterprise-dashboard/title.txt | 2 | ||||
| -rw-r--r-- | basicsuite/enterprise-flat-controls/description.txt | 2 | ||||
| -rw-r--r-- | basicsuite/enterprise-gallery/description.txt | 2 | ||||
| -rw-r--r-- | basicsuite/enterprise-gallery/exclude.txt | 1 | ||||
| -rw-r--r-- | basicsuite/enterprise-gallery/title.txt | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/basicsuite/enterprise-dashboard/description.txt b/basicsuite/enterprise-dashboard/description.txt index dcf2b94..2e5780a 100644 --- a/basicsuite/enterprise-dashboard/description.txt +++ b/basicsuite/enterprise-dashboard/description.txt @@ -1 +1 @@ -The dashboard demo uses Qt Quick Enterprise Controls to create a digital dashboard for a car. +The dashboard demo uses Qt Quick Extras to create a digital dashboard for a car. diff --git a/basicsuite/enterprise-dashboard/title.txt b/basicsuite/enterprise-dashboard/title.txt index 443fdd7..0cecefb 100644 --- a/basicsuite/enterprise-dashboard/title.txt +++ b/basicsuite/enterprise-dashboard/title.txt @@ -1 +1 @@ -060. Qt Quick Enterprise Controls - Dashboard +060. Qt Quick Extras Dashboard diff --git a/basicsuite/enterprise-flat-controls/description.txt b/basicsuite/enterprise-flat-controls/description.txt index 81038e7..98b01e5 100644 --- a/basicsuite/enterprise-flat-controls/description.txt +++ b/basicsuite/enterprise-flat-controls/description.txt @@ -1 +1 @@ -The Flat Style Gallery example showcases the Qt Quick Controls. This demo combines both the standard Qt Quick Controls as well as the Qt Quick Enterprise Controls both of which are using the new Flat style. The Flat style for Qt Quick Controls has a modern look and feel and is perfect for the touch driven interfaces commonly developed by device creators. +The Flat Style Gallery example showcases the Qt Quick Controls. This demo combines both the standard Qt Quick Controls as well as the Qt Quick Extras both of which are using the new Flat style. The Flat style for Qt Quick Controls has a modern look and feel and is perfect for the touch driven interfaces commonly developed by device creators. diff --git a/basicsuite/enterprise-gallery/description.txt b/basicsuite/enterprise-gallery/description.txt index 93b45f6..b7f1d75 100644 --- a/basicsuite/enterprise-gallery/description.txt +++ b/basicsuite/enterprise-gallery/description.txt @@ -1,3 +1,3 @@ -The Gallery example showcases Qt Quick Enterprise Controls. These controls are developed based on the input and feedback coming directly from Qt Enterprise Embedded customers. +The Gallery example showcases Qt Quick Extras. These controls are developed based on the input and feedback coming directly from Qt Enterprise Embedded customers. Each control can be customized and styled through the API. We have included a small subset of these customization options in the gallery example, which you can explore and interact with under the "cog" or "gear" icon on the lower right corner of each control's page. diff --git a/basicsuite/enterprise-gallery/exclude.txt b/basicsuite/enterprise-gallery/exclude.txt deleted file mode 100644 index 0702cb5..0000000 --- a/basicsuite/enterprise-gallery/exclude.txt +++ /dev/null @@ -1 +0,0 @@ -all diff --git a/basicsuite/enterprise-gallery/title.txt b/basicsuite/enterprise-gallery/title.txt index 00ece55..da88dee 100644 --- a/basicsuite/enterprise-gallery/title.txt +++ b/basicsuite/enterprise-gallery/title.txt @@ -1 +1 @@ -070. Qt Quick Enterprise Controls - Gallery +070. Qt Quick Extras - Gallery |