diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-18 13:40:01 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-18 14:14:07 +0000 |
| commit | 0797e0cb2072a0b5cac4d8db2205d932cc64d25c (patch) | |
| tree | 103fd7a6f67a83bd7b6f44dcc9c2a67547aa2cb2 /.gitignore | |
| parent | 2ef6a789e9cd91a9245c65201a6fe3d3322712ad (diff) | |
Merge Qt Quick Extras into Qt Quick Controls
The original split existed because the public and enterprise
controls were developed separately. Now that all controls are
public and developed together, the split no longer makes sense
and is difficult for users to understand.
Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -9,12 +9,11 @@ /examples/quick/controls/mirroring/mirroring /examples/quick/controls/theme/theme /examples/quick/controls/tabs/tabs -/examples/quick/extras/drawer/drawer +/examples/quick/controls/drawer/drawer /tests/auto/accessibility/tst_accessibility /tests/auto/applicationwindow/tst_applicationwindow /tests/auto/controls/tst_controls -/tests/auto/extras/tst_extras /tests/auto/sanity/tst_sanity /tests/auto/snippets/tst_snippets /tests/benchmarks/creationtime/tst_creationtime |