Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb

137 files changed, 292 insertions, 24 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index ab3cd2b2..baa83d16 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    controls
+    quickcontrols2
diff --git a/examples/controls/chattutorial/chapter1-settingup/chapter1-settingup.pro b/examples/quickcontrols2/chattutorial/chapter1-settingup/chapter1-settingup.pro
index a1eebcac..a1eebcac 100644
--- a/examples/controls/chattutorial/chapter1-settingup/chapter1-settingup.pro
+++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/chapter1-settingup.pro
diff --git a/examples/controls/chattutorial/chapter1-settingup/main.cpp b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.cpp
index 3a095d2f..3a095d2f 100644
--- a/examples/controls/chattutorial/chapter1-settingup/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.cpp
diff --git a/examples/controls/chattutorial/chapter1-settingup/main.qml b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml
index 477d14e2..477d14e2 100644
--- a/examples/controls/chattutorial/chapter1-settingup/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml
diff --git a/examples/controls/chattutorial/chapter1-settingup/qml.qrc b/examples/quickcontrols2/chattutorial/chapter1-settingup/qml.qrc
index 0ff3892d..0ff3892d 100644
--- a/examples/controls/chattutorial/chapter1-settingup/qml.qrc
+++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/qml.qrc
diff --git a/examples/controls/chattutorial/chapter2-lists/chapter2-lists.pro b/examples/quickcontrols2/chattutorial/chapter2-lists/chapter2-lists.pro
index 9d5187ff..9d5187ff 100644
--- a/examples/controls/chattutorial/chapter2-lists/chapter2-lists.pro
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/chapter2-lists.pro
diff --git a/examples/controls/chattutorial/chapter2-lists/main.cpp b/examples/quickcontrols2/chattutorial/chapter2-lists/main.cpp
index 3a095d2f..3a095d2f 100644
--- a/examples/controls/chattutorial/chapter2-lists/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/main.cpp
diff --git a/examples/controls/chattutorial/chapter2-lists/main.qml b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
index 290219aa..290219aa 100644
--- a/examples/controls/chattutorial/chapter2-lists/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml
diff --git a/examples/controls/chattutorial/chapter2-lists/qml.qrc b/examples/quickcontrols2/chattutorial/chapter2-lists/qml.qrc
index 0ff3892d..0ff3892d 100644
--- a/examples/controls/chattutorial/chapter2-lists/qml.qrc
+++ b/examples/quickcontrols2/chattutorial/chapter2-lists/qml.qrc
diff --git a/examples/controls/chattutorial/chapter3-navigation/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
index f1589387..f1589387 100644
--- a/examples/controls/chattutorial/chapter3-navigation/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml
diff --git a/examples/controls/chattutorial/chapter3-navigation/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
index b4393a93..b4393a93 100644
--- a/examples/controls/chattutorial/chapter3-navigation/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml
diff --git a/examples/controls/chattutorial/chapter3-navigation/chapter3-navigation.pro b/examples/quickcontrols2/chattutorial/chapter3-navigation/chapter3-navigation.pro
index 7a64f65d..7a64f65d 100644
--- a/examples/controls/chattutorial/chapter3-navigation/chapter3-navigation.pro
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/chapter3-navigation.pro
diff --git a/examples/controls/chattutorial/chapter3-navigation/main.cpp b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.cpp
index 3a095d2f..3a095d2f 100644
--- a/examples/controls/chattutorial/chapter3-navigation/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.cpp
diff --git a/examples/controls/chattutorial/chapter3-navigation/main.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml
index b373c6b8..b373c6b8 100644
--- a/examples/controls/chattutorial/chapter3-navigation/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml
diff --git a/examples/controls/chattutorial/chapter3-navigation/qml.qrc b/examples/quickcontrols2/chattutorial/chapter3-navigation/qml.qrc
index a72e1b71..a72e1b71 100644
--- a/examples/controls/chattutorial/chapter3-navigation/qml.qrc
+++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/qml.qrc
diff --git a/examples/controls/chattutorial/chapter4-models/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
index 8ec0ca51..8ec0ca51 100644
--- a/examples/controls/chattutorial/chapter4-models/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml
diff --git a/examples/controls/chattutorial/chapter4-models/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
index 467a1924..467a1924 100644
--- a/examples/controls/chattutorial/chapter4-models/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml
diff --git a/examples/controls/chattutorial/chapter4-models/chapter4-models.pro b/examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models.pro
index e7709019..e7709019 100644
--- a/examples/controls/chattutorial/chapter4-models/chapter4-models.pro
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models.pro
diff --git a/examples/controls/chattutorial/chapter4-models/main.cpp b/examples/quickcontrols2/chattutorial/chapter4-models/main.cpp
index 9f2109fa..9f2109fa 100644
--- a/examples/controls/chattutorial/chapter4-models/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/main.cpp
diff --git a/examples/controls/chattutorial/chapter4-models/main.qml b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml
index b373c6b8..b373c6b8 100644
--- a/examples/controls/chattutorial/chapter4-models/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml
diff --git a/examples/controls/chattutorial/chapter4-models/qml.qrc b/examples/quickcontrols2/chattutorial/chapter4-models/qml.qrc
index a72e1b71..a72e1b71 100644
--- a/examples/controls/chattutorial/chapter4-models/qml.qrc
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/qml.qrc
diff --git a/examples/controls/chattutorial/chapter4-models/sqlcontactmodel.cpp b/examples/quickcontrols2/chattutorial/chapter4-models/sqlcontactmodel.cpp
index d1cfb796..d1cfb796 100644
--- a/examples/controls/chattutorial/chapter4-models/sqlcontactmodel.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/sqlcontactmodel.cpp
diff --git a/examples/controls/chattutorial/chapter4-models/sqlcontactmodel.h b/examples/quickcontrols2/chattutorial/chapter4-models/sqlcontactmodel.h
index 00dd6a6f..00dd6a6f 100644
--- a/examples/controls/chattutorial/chapter4-models/sqlcontactmodel.h
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/sqlcontactmodel.h
diff --git a/examples/controls/chattutorial/chapter4-models/sqlconversationmodel.cpp b/examples/quickcontrols2/chattutorial/chapter4-models/sqlconversationmodel.cpp
index 56f1b838..56f1b838 100644
--- a/examples/controls/chattutorial/chapter4-models/sqlconversationmodel.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/sqlconversationmodel.cpp
diff --git a/examples/controls/chattutorial/chapter4-models/sqlconversationmodel.h b/examples/quickcontrols2/chattutorial/chapter4-models/sqlconversationmodel.h
index 0ce12049..0ce12049 100644
--- a/examples/controls/chattutorial/chapter4-models/sqlconversationmodel.h
+++ b/examples/quickcontrols2/chattutorial/chapter4-models/sqlconversationmodel.h
diff --git a/examples/controls/chattutorial/chapter5-styling/+material/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
index 57a239cb..57a239cb 100644
--- a/examples/controls/chattutorial/chapter5-styling/+material/ChatToolBar.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml
diff --git a/examples/controls/chattutorial/chapter5-styling/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml
index 10c2890f..10c2890f 100644
--- a/examples/controls/chattutorial/chapter5-styling/ChatToolBar.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml
diff --git a/examples/controls/chattutorial/chapter5-styling/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
index 7f24f275..7f24f275 100644
--- a/examples/controls/chattutorial/chapter5-styling/ContactPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml
diff --git a/examples/controls/chattutorial/chapter5-styling/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
index b65f69a9..b65f69a9 100644
--- a/examples/controls/chattutorial/chapter5-styling/ConversationPage.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml
diff --git a/examples/controls/chattutorial/chapter5-styling/chapter5-styling.pro b/examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling.pro
index 204442ba..204442ba 100644
--- a/examples/controls/chattutorial/chapter5-styling/chapter5-styling.pro
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling.pro
diff --git a/examples/controls/chattutorial/chapter5-styling/main.cpp b/examples/quickcontrols2/chattutorial/chapter5-styling/main.cpp
index 9f2109fa..9f2109fa 100644
--- a/examples/controls/chattutorial/chapter5-styling/main.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/main.cpp
diff --git a/examples/controls/chattutorial/chapter5-styling/main.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml
index b373c6b8..b373c6b8 100644
--- a/examples/controls/chattutorial/chapter5-styling/main.qml
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml
diff --git a/examples/controls/chattutorial/chapter5-styling/qml.qrc b/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc
index eab2140a..eab2140a 100644
--- a/examples/controls/chattutorial/chapter5-styling/qml.qrc
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/qml.qrc
diff --git a/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf b/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols.conf
index e338c804..e338c804 100644
--- a/examples/controls/chattutorial/chapter5-styling/qtquickcontrols.conf
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/qtquickcontrols.conf
diff --git a/examples/controls/chattutorial/chapter5-styling/sqlcontactmodel.cpp b/examples/quickcontrols2/chattutorial/chapter5-styling/sqlcontactmodel.cpp
index d1cfb796..d1cfb796 100644
--- a/examples/controls/chattutorial/chapter5-styling/sqlcontactmodel.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/sqlcontactmodel.cpp
diff --git a/examples/controls/chattutorial/chapter5-styling/sqlcontactmodel.h b/examples/quickcontrols2/chattutorial/chapter5-styling/sqlcontactmodel.h
index 00dd6a6f..00dd6a6f 100644
--- a/examples/controls/chattutorial/chapter5-styling/sqlcontactmodel.h
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/sqlcontactmodel.h
diff --git a/examples/controls/chattutorial/chapter5-styling/sqlconversationmodel.cpp b/examples/quickcontrols2/chattutorial/chapter5-styling/sqlconversationmodel.cpp
index 56f1b838..56f1b838 100644
--- a/examples/controls/chattutorial/chapter5-styling/sqlconversationmodel.cpp
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/sqlconversationmodel.cpp
diff --git a/examples/controls/chattutorial/chapter5-styling/sqlconversationmodel.h b/examples/quickcontrols2/chattutorial/chapter5-styling/sqlconversationmodel.h
index 0ce12049..0ce12049 100644
--- a/examples/controls/chattutorial/chapter5-styling/sqlconversationmodel.h
+++ b/examples/quickcontrols2/chattutorial/chapter5-styling/sqlconversationmodel.h
diff --git a/examples/controls/chattutorial/chattutorial.pro b/examples/quickcontrols2/chattutorial/chattutorial.pro
index 2f38254e..2f38254e 100644
--- a/examples/controls/chattutorial/chattutorial.pro
+++ b/examples/quickcontrols2/chattutorial/chattutorial.pro
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
index ee03535f..ee03535f 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
index 17096519..17096519 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
index c2c49e3e..c2c49e3e 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
index 07eb93b1..07eb93b1 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
index 9ca0fe69..9ca0fe69 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
index 1763b1f3..1763b1f3 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
index acbe1886..acbe1886 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
index e4a578cc..e4a578cc 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
index dd47c4cb..dd47c4cb 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
index 9a3d00bd..9a3d00bd 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
index 501ea772..501ea772 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
index 57782b58..57782b58 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
index 22183c82..22183c82 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
index 327076d3..327076d3 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
index 19a7b685..19a7b685 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
index 4cc4caa3..4cc4caa3 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
index bdc9bcd3..bdc9bcd3 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
index f10d6cb6..f10d6cb6 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
diff --git a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
index a6913c3c..a6913c3c 100644
--- a/examples/controls/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
+++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
diff --git a/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index e83f84c2..e83f84c2 100644
--- a/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
diff --git a/examples/controls/chattutorial/shared/Albert Einstein.png b/examples/quickcontrols2/chattutorial/shared/Albert Einstein.png
index 47cb15f6..47cb15f6 100644
--- a/examples/controls/chattutorial/shared/Albert Einstein.png
+++ b/examples/quickcontrols2/chattutorial/shared/Albert Einstein.png
diff --git a/examples/controls/chattutorial/shared/Albert Einstein@2x.png b/examples/quickcontrols2/chattutorial/shared/Albert Einstein@2x.png
index c80ddd15..c80ddd15 100644
--- a/examples/controls/chattutorial/shared/Albert Einstein@2x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Albert Einstein@2x.png
diff --git a/examples/controls/chattutorial/shared/Albert Einstein@3x.png b/examples/quickcontrols2/chattutorial/shared/Albert Einstein@3x.png
index 41778835..41778835 100644
--- a/examples/controls/chattutorial/shared/Albert Einstein@3x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Albert Einstein@3x.png
diff --git a/examples/controls/chattutorial/shared/Albert Einstein@4x.png b/examples/quickcontrols2/chattutorial/shared/Albert Einstein@4x.png
index 88768902..88768902 100644
--- a/examples/controls/chattutorial/shared/Albert Einstein@4x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Albert Einstein@4x.png
diff --git a/examples/controls/chattutorial/shared/Ernest Hemingway.png b/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway.png
index 988c2416..988c2416 100644
--- a/examples/controls/chattutorial/shared/Ernest Hemingway.png
+++ b/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway.png
diff --git a/examples/controls/chattutorial/shared/Ernest Hemingway@2x.png b/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@2x.png
index efffc1f2..efffc1f2 100644
--- a/examples/controls/chattutorial/shared/Ernest Hemingway@2x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@2x.png
diff --git a/examples/controls/chattutorial/shared/Ernest Hemingway@3x.png b/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@3x.png
index 12633ec2..12633ec2 100644
--- a/examples/controls/chattutorial/shared/Ernest Hemingway@3x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@3x.png
diff --git a/examples/controls/chattutorial/shared/Ernest Hemingway@4x.png b/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@4x.png
index f5639280..f5639280 100644
--- a/examples/controls/chattutorial/shared/Ernest Hemingway@4x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Ernest Hemingway@4x.png
diff --git a/examples/controls/chattutorial/shared/Hans Gude.png b/examples/quickcontrols2/chattutorial/shared/Hans Gude.png
index 7367a4a4..7367a4a4 100644
--- a/examples/controls/chattutorial/shared/Hans Gude.png
+++ b/examples/quickcontrols2/chattutorial/shared/Hans Gude.png
diff --git a/examples/controls/chattutorial/shared/Hans Gude@2x.png b/examples/quickcontrols2/chattutorial/shared/Hans Gude@2x.png
index c3a394e1..c3a394e1 100644
--- a/examples/controls/chattutorial/shared/Hans Gude@2x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Hans Gude@2x.png
diff --git a/examples/controls/chattutorial/shared/Hans Gude@3x.png b/examples/quickcontrols2/chattutorial/shared/Hans Gude@3x.png
index 38ec67ee..38ec67ee 100644
--- a/examples/controls/chattutorial/shared/Hans Gude@3x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Hans Gude@3x.png
diff --git a/examples/controls/chattutorial/shared/Hans Gude@4x.png b/examples/quickcontrols2/chattutorial/shared/Hans Gude@4x.png
index 8c75d3e0..8c75d3e0 100644
--- a/examples/controls/chattutorial/shared/Hans Gude@4x.png
+++ b/examples/quickcontrols2/chattutorial/shared/Hans Gude@4x.png
diff --git a/examples/controls/chattutorial/shared/shared.qrc b/examples/quickcontrols2/chattutorial/shared/shared.qrc
index 8e112513..8e112513 100644
--- a/examples/controls/chattutorial/shared/shared.qrc
+++ b/examples/quickcontrols2/chattutorial/shared/shared.qrc
diff --git a/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-drawer.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
index 57ec1026..57ec1026 100644
--- a/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
diff --git a/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-menu.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
index 5b34264e..5b34264e 100644
--- a/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-menu.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
diff --git a/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-welcome.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
index 5c2bb682..5c2bb682 100644
--- a/examples/controls/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
diff --git a/examples/controls/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
index 2f43472f..2f43472f 100644
--- a/examples/controls/gallery/doc/src/qtquickcontrols2-gallery.qdoc
+++ b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
diff --git a/examples/controls/gallery/gallery.cpp b/examples/quickcontrols2/gallery/gallery.cpp
index 90b63cac..90b63cac 100644
--- a/examples/controls/gallery/gallery.cpp
+++ b/examples/quickcontrols2/gallery/gallery.cpp
diff --git a/examples/controls/gallery/gallery.pro b/examples/quickcontrols2/gallery/gallery.pro
index 506eefd1..cb0736fd 100644
--- a/examples/controls/gallery/gallery.pro
+++ b/examples/quickcontrols2/gallery/gallery.pro
@@ -12,5 +12,5 @@ OTHER_FILES += \
 RESOURCES += \
     gallery.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtlabscontrols/gallery
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery
 INSTALLS += target
diff --git a/examples/controls/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index 828746a4..828746a4 100644
--- a/examples/controls/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
diff --git a/examples/controls/gallery/gallery.qrc b/examples/quickcontrols2/gallery/gallery.qrc
index ee4bf5b7..ee4bf5b7 100644
--- a/examples/controls/gallery/gallery.qrc
+++ b/examples/quickcontrols2/gallery/gallery.qrc
diff --git a/examples/controls/gallery/images/arrow.png b/examples/quickcontrols2/gallery/images/arrow.png
index 340139de..340139de 100644
--- a/examples/controls/gallery/images/arrow.png
+++ b/examples/quickcontrols2/gallery/images/arrow.png
diff --git a/examples/controls/gallery/images/arrow@2x.png b/examples/quickcontrols2/gallery/images/arrow@2x.png
index ef2016e9..ef2016e9 100644
--- a/examples/controls/gallery/images/arrow@2x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@2x.png
diff --git a/examples/controls/gallery/images/arrow@3x.png b/examples/quickcontrols2/gallery/images/arrow@3x.png
index 86c8506b..86c8506b 100644
--- a/examples/controls/gallery/images/arrow@3x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@3x.png
diff --git a/examples/controls/gallery/images/arrow@4x.png b/examples/quickcontrols2/gallery/images/arrow@4x.png
index ce70d95b..ce70d95b 100644
--- a/examples/controls/gallery/images/arrow@4x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@4x.png
diff --git a/examples/controls/gallery/images/arrows.png b/examples/quickcontrols2/gallery/images/arrows.png
index f77e01fa..f77e01fa 100644
--- a/examples/controls/gallery/images/arrows.png
+++ b/examples/quickcontrols2/gallery/images/arrows.png
diff --git a/examples/controls/gallery/images/arrows@2x.png b/examples/quickcontrols2/gallery/images/arrows@2x.png
index 9615d436..9615d436 100644
--- a/examples/controls/gallery/images/arrows@2x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@2x.png
diff --git a/examples/controls/gallery/images/arrows@3x.png b/examples/quickcontrols2/gallery/images/arrows@3x.png
index b6a53e1c..b6a53e1c 100644
--- a/examples/controls/gallery/images/arrows@3x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@3x.png
diff --git a/examples/controls/gallery/images/arrows@4x.png b/examples/quickcontrols2/gallery/images/arrows@4x.png
index 099ed1b5..099ed1b5 100644
--- a/examples/controls/gallery/images/arrows@4x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@4x.png
diff --git a/examples/controls/gallery/images/drawer.png b/examples/quickcontrols2/gallery/images/drawer.png
index 1e974efa..1e974efa 100644
--- a/examples/controls/gallery/images/drawer.png
+++ b/examples/quickcontrols2/gallery/images/drawer.png
diff --git a/examples/controls/gallery/images/drawer@2x.png b/examples/quickcontrols2/gallery/images/drawer@2x.png
index eba3b6cc..eba3b6cc 100644
--- a/examples/controls/gallery/images/drawer@2x.png
+++ b/examples/quickcontrols2/gallery/images/drawer@2x.png
diff --git a/examples/controls/gallery/images/drawer@3x.png b/examples/quickcontrols2/gallery/images/drawer@3x.png
index 3584ed6d..3584ed6d 100644
--- a/examples/controls/gallery/images/drawer@3x.png
+++ b/examples/quickcontrols2/gallery/images/drawer@3x.png
diff --git a/examples/controls/gallery/images/drawer@4x.png b/examples/quickcontrols2/gallery/images/drawer@4x.png
index 60d93aff..60d93aff 100644
--- a/examples/controls/gallery/images/drawer@4x.png
+++ b/examples/quickcontrols2/gallery/images/drawer@4x.png
diff --git a/examples/controls/gallery/images/menu.png b/examples/quickcontrols2/gallery/images/menu.png
index a10473d9..a10473d9 100644
--- a/examples/controls/gallery/images/menu.png
+++ b/examples/quickcontrols2/gallery/images/menu.png
diff --git a/examples/controls/gallery/images/menu@2x.png b/examples/quickcontrols2/gallery/images/menu@2x.png
index 649c2a08..649c2a08 100644
--- a/examples/controls/gallery/images/menu@2x.png
+++ b/examples/quickcontrols2/gallery/images/menu@2x.png
diff --git a/examples/controls/gallery/images/menu@3x.png b/examples/quickcontrols2/gallery/images/menu@3x.png
index 9554b695..9554b695 100644
--- a/examples/controls/gallery/images/menu@3x.png
+++ b/examples/quickcontrols2/gallery/images/menu@3x.png
diff --git a/examples/controls/gallery/images/menu@4x.png b/examples/quickcontrols2/gallery/images/menu@4x.png
index 187c171c..187c171c 100644
--- a/examples/controls/gallery/images/menu@4x.png
+++ b/examples/quickcontrols2/gallery/images/menu@4x.png
diff --git a/examples/controls/gallery/images/qt-logo.png b/examples/quickcontrols2/gallery/images/qt-logo.png
index 8b0772b0..8b0772b0 100644
--- a/examples/controls/gallery/images/qt-logo.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo.png
diff --git a/examples/controls/gallery/images/qt-logo@2x.png b/examples/quickcontrols2/gallery/images/qt-logo@2x.png
index 0d1d499b..0d1d499b 100644
--- a/examples/controls/gallery/images/qt-logo@2x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@2x.png
diff --git a/examples/controls/gallery/images/qt-logo@3x.png b/examples/quickcontrols2/gallery/images/qt-logo@3x.png
index c9aae358..c9aae358 100644
--- a/examples/controls/gallery/images/qt-logo@3x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@3x.png
diff --git a/examples/controls/gallery/images/qt-logo@4x.png b/examples/quickcontrols2/gallery/images/qt-logo@4x.png
index ad0ebd03..ad0ebd03 100644
--- a/examples/controls/gallery/images/qt-logo@4x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@4x.png
diff --git a/examples/controls/gallery/pages/BusyIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
index 5aed6e59..5aed6e59 100644
--- a/examples/controls/gallery/pages/BusyIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml
diff --git a/examples/controls/gallery/pages/ButtonPage.qml b/examples/quickcontrols2/gallery/pages/ButtonPage.qml
index 4ac657d2..4ac657d2 100644
--- a/examples/controls/gallery/pages/ButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ButtonPage.qml
diff --git a/examples/controls/gallery/pages/CheckBoxPage.qml b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
index 861f144d..861f144d 100644
--- a/examples/controls/gallery/pages/CheckBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml
diff --git a/examples/controls/gallery/pages/ComboBoxPage.qml b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
index 4400612f..4400612f 100644
--- a/examples/controls/gallery/pages/ComboBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml
diff --git a/examples/controls/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
index 0d50adbf..0d50adbf 100644
--- a/examples/controls/gallery/pages/DelegatePage.qml
+++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
diff --git a/examples/controls/gallery/pages/DialPage.qml b/examples/quickcontrols2/gallery/pages/DialPage.qml
index 5277d7b0..5277d7b0 100644
--- a/examples/controls/gallery/pages/DialPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DialPage.qml
diff --git a/examples/controls/gallery/pages/DrawerPage.qml b/examples/quickcontrols2/gallery/pages/DrawerPage.qml
index 910a0c7c..910a0c7c 100644
--- a/examples/controls/gallery/pages/DrawerPage.qml
+++ b/examples/quickcontrols2/gallery/pages/DrawerPage.qml
diff --git a/examples/controls/gallery/pages/FramePage.qml b/examples/quickcontrols2/gallery/pages/FramePage.qml
index 5b3ef4de..5b3ef4de 100644
--- a/examples/controls/gallery/pages/FramePage.qml
+++ b/examples/quickcontrols2/gallery/pages/FramePage.qml
diff --git a/examples/controls/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
index 996e65d2..996e65d2 100644
--- a/examples/controls/gallery/pages/GroupBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml
diff --git a/examples/controls/gallery/pages/MenuPage.qml b/examples/quickcontrols2/gallery/pages/MenuPage.qml
index 119be559..119be559 100644
--- a/examples/controls/gallery/pages/MenuPage.qml
+++ b/examples/quickcontrols2/gallery/pages/MenuPage.qml
diff --git a/examples/controls/gallery/pages/PageIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
index f8557f24..f8557f24 100644
--- a/examples/controls/gallery/pages/PageIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml
diff --git a/examples/controls/gallery/pages/PopupPage.qml b/examples/quickcontrols2/gallery/pages/PopupPage.qml
index d2685969..d2685969 100644
--- a/examples/controls/gallery/pages/PopupPage.qml
+++ b/examples/quickcontrols2/gallery/pages/PopupPage.qml
diff --git a/examples/controls/gallery/pages/ProgressBarPage.qml b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
index 7beb4125..7beb4125 100644
--- a/examples/controls/gallery/pages/ProgressBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml
diff --git a/examples/controls/gallery/pages/RadioButtonPage.qml b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
index fe6a751c..fe6a751c 100644
--- a/examples/controls/gallery/pages/RadioButtonPage.qml
+++ b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml
diff --git a/examples/controls/gallery/pages/RangeSliderPage.qml b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
index dd7bd880..dd7bd880 100644
--- a/examples/controls/gallery/pages/RangeSliderPage.qml
+++ b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml
diff --git a/examples/controls/gallery/pages/ScrollBarPage.qml b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
index 0db1888d..0db1888d 100644
--- a/examples/controls/gallery/pages/ScrollBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml
diff --git a/examples/controls/gallery/pages/ScrollIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
index 658b7d15..658b7d15 100644
--- a/examples/controls/gallery/pages/ScrollIndicatorPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml
diff --git a/examples/controls/gallery/pages/SliderPage.qml b/examples/quickcontrols2/gallery/pages/SliderPage.qml
index c400ec41..c400ec41 100644
--- a/examples/controls/gallery/pages/SliderPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SliderPage.qml
diff --git a/examples/controls/gallery/pages/SpinBoxPage.qml b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
index c309ce8e..c309ce8e 100644
--- a/examples/controls/gallery/pages/SpinBoxPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml
diff --git a/examples/controls/gallery/pages/StackViewPage.qml b/examples/quickcontrols2/gallery/pages/StackViewPage.qml
index 19416aa6..19416aa6 100644
--- a/examples/controls/gallery/pages/StackViewPage.qml
+++ b/examples/quickcontrols2/gallery/pages/StackViewPage.qml
diff --git a/examples/controls/gallery/pages/SwipeViewPage.qml b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
index aded5d73..aded5d73 100644
--- a/examples/controls/gallery/pages/SwipeViewPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml
diff --git a/examples/controls/gallery/pages/SwitchPage.qml b/examples/quickcontrols2/gallery/pages/SwitchPage.qml
index ebb4f2ee..ebb4f2ee 100644
--- a/examples/controls/gallery/pages/SwitchPage.qml
+++ b/examples/quickcontrols2/gallery/pages/SwitchPage.qml
diff --git a/examples/controls/gallery/pages/TabBarPage.qml b/examples/quickcontrols2/gallery/pages/TabBarPage.qml
index 7e465ec3..7e465ec3 100644
--- a/examples/controls/gallery/pages/TabBarPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TabBarPage.qml
diff --git a/examples/controls/gallery/pages/TextAreaPage.qml b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
index 8ca759c8..8ca759c8 100644
--- a/examples/controls/gallery/pages/TextAreaPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml
diff --git a/examples/controls/gallery/pages/TextFieldPage.qml b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
index 761d2fa6..761d2fa6 100644
--- a/examples/controls/gallery/pages/TextFieldPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml
diff --git a/examples/controls/gallery/pages/ToolTipPage.qml b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
index 27e2ba01..27e2ba01 100644
--- a/examples/controls/gallery/pages/ToolTipPage.qml
+++ b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml
diff --git a/examples/controls/gallery/pages/TumblerPage.qml b/examples/quickcontrols2/gallery/pages/TumblerPage.qml
index b15407e5..b15407e5 100644
--- a/examples/controls/gallery/pages/TumblerPage.qml
+++ b/examples/quickcontrols2/gallery/pages/TumblerPage.qml
diff --git a/examples/controls/gallery/qtquickcontrols.conf b/examples/quickcontrols2/gallery/qtquickcontrols.conf
index 61375ac1..61375ac1 100644
--- a/examples/controls/gallery/qtquickcontrols.conf
+++ b/examples/quickcontrols2/gallery/qtquickcontrols.conf
diff --git a/examples/controls/controls.pro b/examples/quickcontrols2/quickcontrols2.pro
index 4f0f2fcc..4f0f2fcc 100644
--- a/examples/controls/controls.pro
+++ b/examples/quickcontrols2/quickcontrols2.pro
diff --git a/src/imports/calendar/qquickcalendarmodel.cpp b/src/imports/calendar/qquickcalendarmodel.cpp
index 9d214450..473e43a2 100644
--- a/src/imports/calendar/qquickcalendarmodel.cpp
+++ b/src/imports/calendar/qquickcalendarmodel.cpp
@@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE
     The Qt Labs Calendar module uses 0-based month numbers to be consistent
     with the JavaScript Date type, that is used by the QML language. This
     means that \c Date::getMonth() can be passed to the methods as is. When
-    dealing with dealing with month numbers directly, it is highly recommended
-    to use the following enumeration values to avoid confusion.
+    dealing with month numbers directly, it is highly recommended to use the
+    following enumeration values to avoid confusion.
 
     \value Calendar.January January (0)
     \value Calendar.February February (1)
@@ -183,7 +183,7 @@ void QQuickCalendarModel::setTo(const QDate &to)
         if (d->complete)
             d->populate(d->from, to);
         d->to = to;
-        emit fromChanged();
+        emit toChanged();
     }
 }
 
diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtquickcontrols2.metainfo
index 39d7016c..877e183f 100644
--- a/src/imports/controls/designer/qtquickcontrols2.metainfo
+++ b/src/imports/controls/designer/qtquickcontrols2.metainfo
@@ -23,7 +23,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Button')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Button\")" }
         }
     }
 
@@ -38,7 +38,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Check Box')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Check Box\")" }
         }
     }
 
@@ -112,7 +112,7 @@ MetaInfo {
 
             Property { name: "width"; type: "int"; value: 200 }
             Property { name: "height"; type: "int"; value: 200 }
-            Property { name: "title"; type: "binding"; value: "qsTr('Group Box')" }
+            Property { name: "title"; type: "binding"; value: "qsTr(\"Group Box\")" }
         }
     }
 
@@ -127,7 +127,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Item Delegate')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Item Delegate\")" }
         }
     }
 
@@ -142,7 +142,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Label')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Label\")" }
         }
     }
 
@@ -203,7 +203,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Radio Button')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Button\")" }
         }
     }
 
@@ -261,7 +261,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Switch')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Switch\")" }
         }
     }
 
@@ -276,7 +276,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Text Area')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Text Area\")" }
         }
     }
 
@@ -291,7 +291,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Text Field')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Text Field\")" }
         }
     }
 
@@ -306,7 +306,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "Qt.labs.controls"
 
-            Property { name: "text"; type: "binding"; value: "qsTr('Tool Button')" }
+            Property { name: "text"; type: "binding"; value: "qsTr(\"Tool Button\")" }
         }
     }
 
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index 0a19bdf5..c781ae28 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -34,14 +34,14 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qmake
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Note: paths passed to \example command must contain the parent directory, e.g.
 # \example controls/tabs
-exampledirs += ../../../../examples/controls \
+exampledirs += ../../../../examples/quickcontrols2 \
                ../ \
                ../../../quicktemplates2 \
                ../../calendar \
                ../../../../tests/auto/controls/data \
                snippets
 
-examplesinstallpath = qtquickcontrols2/controls
+examplesinstallpath = qtquickcontrols2/quickcontrols2
 
 headerdirs += ../../../quicktemplates2 \
               ../../calendar \
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index f8fc84c8..1851a1f8 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -74,6 +74,31 @@ T.SpinBox {
         selectedTextColor: control.Material.primaryTextColor
         horizontalAlignment: Qt.AlignHCenter
         verticalAlignment: Qt.AlignVCenter
+        cursorDelegate: Rectangle {
+            id: cursor
+            color: control.Material.accentColor
+            width: 2
+            visible: control.activeFocus && contentItem.selectionStart === contentItem.selectionEnd
+
+            Connections {
+                target: contentItem
+                onCursorPositionChanged: {
+                    // keep a moving cursor visible
+                    cursor.opacity = 1
+                    timer.restart()
+                }
+            }
+
+            Timer {
+                id: timer
+                running: control.activeFocus
+                repeat: true
+                interval: Qt.styleHints.cursorFlashTime
+                onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0
+                // force the cursor visible when gaining focus
+                onRunningChanged: cursor.opacity = 1
+            }
+        }
 
         readOnly: !control.editable
         validator: control.validator
diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml
index 41940dd5..b952d319 100644
--- a/src/imports/controls/material/TextArea.qml
+++ b/src/imports/controls/material/TextArea.qml
@@ -44,11 +44,12 @@ T.TextArea {
     implicitWidth: Math.max(contentWidth + leftPadding + rightPadding,
                             background ? background.implicitWidth : 0,
                             placeholder.implicitWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(contentHeight + topPadding + bottomPadding,
+    implicitHeight: Math.max(contentHeight + 1 + topPadding + bottomPadding,
                              background ? background.implicitHeight : 0,
-                             placeholder.implicitHeight + topPadding + bottomPadding)
+                             placeholder.implicitHeight + 1 + topPadding + bottomPadding)
 
-    padding: 6
+    topPadding: 8
+    bottomPadding: 16
 
     color: enabled ? Material.primaryTextColor : Material.hintTextColor
     selectionColor: Material.accentColor
@@ -98,7 +99,7 @@ T.TextArea {
 
     //! [background]
     background: Rectangle {
-        y: control.height - height
+        y: control.height - height - control.bottomPadding / 2
         implicitWidth: 120
         height: control.activeFocus ? 2 : 1
         color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor
diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml
index 2f5936ec..25cd6fe8 100644
--- a/src/imports/controls/material/TextField.qml
+++ b/src/imports/controls/material/TextField.qml
@@ -44,9 +44,10 @@ T.TextField {
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             placeholder.implicitWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
-                             placeholder.implicitHeight + topPadding + bottomPadding)
+                             placeholder.implicitHeight + 1 + topPadding + bottomPadding)
 
-    padding: 6
+    topPadding: 8
+    bottomPadding: 16
 
     color: enabled ? Material.primaryTextColor : Material.hintTextColor
     selectionColor: Material.accentColor
@@ -98,7 +99,7 @@ T.TextField {
 
     //! [background]
     background: Rectangle {
-        y: control.height - height
+        y: control.height - height - control.bottomPadding / 2
         implicitWidth: 120
         height: control.activeFocus ? 2 : 1
         color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index 5bb504e3..ac081c7d 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -36,6 +36,86 @@ Module {
         Signal { name: "doubleClicked" }
         Method { name: "toggle" }
     }
+    //
+    // Manually added to work around QtC limitations:
+    //
+    Component {
+        name: "QQuickWindowQmlImpl"
+        defaultProperty: "data"
+        prototype: "QQuickWindow"
+        exports: ["QtQuick.Window/Window 2.1", "QtQuick.Window/Window 2.2"]
+        exportMetaObjectRevisions: [0, 1]
+        attachedType: "QQuickWindowAttached"
+        Property { name: "visible"; type: "bool" }
+        Property { name: "visibility"; type: "Visibility" }
+        Signal {
+            name: "visibleChanged"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Signal {
+            name: "visibilityChanged"
+            Parameter { name: "visibility"; type: "QWindow::Visibility" }
+        }
+    }
+    Component {
+        name: "QQuickWindow"
+        defaultProperty: "data"
+        prototype: "QWindow"
+        exports: [
+            "QtQuick.Window/Window 2.0",
+            "QtQuick.Window/Window 2.1",
+            "QtQuick.Window/Window 2.2"
+        ]
+        exportMetaObjectRevisions: [0, 1, 2]
+        Enum {
+            name: "SceneGraphError"
+            values: {
+                "ContextNotAvailable": 1
+            }
+        }
+        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property {
+            name: "activeFocusItem"
+            revision: 1
+            type: "QQuickItem"
+            isReadonly: true
+            isPointer: true
+        }
+        Signal { name: "frameSwapped" }
+        Signal {
+            name: "openglContextCreated"
+            revision: 2
+            Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true }
+        }
+        Signal { name: "sceneGraphInitialized" }
+        Signal { name: "sceneGraphInvalidated" }
+        Signal { name: "beforeSynchronizing" }
+        Signal { name: "afterSynchronizing"; revision: 2 }
+        Signal { name: "beforeRendering" }
+        Signal { name: "afterRendering" }
+        Signal { name: "afterAnimating"; revision: 2 }
+        Signal { name: "sceneGraphAboutToStop"; revision: 2 }
+        Signal {
+            name: "closing"
+            revision: 1
+            Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true }
+        }
+        Signal {
+            name: "colorChanged"
+            Parameter { type: "QColor" }
+        }
+        Signal { name: "activeFocusItemChanged"; revision: 1 }
+        Signal {
+            name: "sceneGraphError"
+            revision: 2
+            Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" }
+            Parameter { name: "message"; type: "string" }
+        }
+        Method { name: "update" }
+        Method { name: "releaseResources" }
+    }
     Component {
         name: "QQuickApplicationWindow"
         defaultProperty: "data"
@@ -54,6 +134,165 @@ Module {
         Property { name: "locale"; type: "QLocale" }
     }
     Component {
+        name: "QWindow"
+        prototype: "QObject"
+        Enum {
+            name: "Visibility"
+            values: {
+                "Hidden": 0,
+                "AutomaticVisibility": 1,
+                "Windowed": 2,
+                "Minimized": 3,
+                "Maximized": 4,
+                "FullScreen": 5
+            }
+        }
+        Property { name: "title"; type: "string" }
+        Property { name: "modality"; type: "Qt::WindowModality" }
+        Property { name: "flags"; type: "Qt::WindowFlags" }
+        Property { name: "x"; type: "int" }
+        Property { name: "y"; type: "int" }
+        Property { name: "width"; type: "int" }
+        Property { name: "height"; type: "int" }
+        Property { name: "minimumWidth"; type: "int" }
+        Property { name: "minimumHeight"; type: "int" }
+        Property { name: "maximumWidth"; type: "int" }
+        Property { name: "maximumHeight"; type: "int" }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "active"; revision: 1; type: "bool"; isReadonly: true }
+        Property { name: "visibility"; revision: 1; type: "Visibility" }
+        Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" }
+        Property { name: "opacity"; revision: 1; type: "double" }
+        Signal {
+            name: "screenChanged"
+            Parameter { name: "screen"; type: "QScreen"; isPointer: true }
+        }
+        Signal {
+            name: "modalityChanged"
+            Parameter { name: "modality"; type: "Qt::WindowModality" }
+        }
+        Signal {
+            name: "windowStateChanged"
+            Parameter { name: "windowState"; type: "Qt::WindowState" }
+        }
+        Signal {
+            name: "windowTitleChanged"
+            revision: 2
+            Parameter { name: "title"; type: "string" }
+        }
+        Signal {
+            name: "xChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "yChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "widthChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "heightChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "minimumWidthChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "minimumHeightChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "maximumWidthChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "maximumHeightChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "visibleChanged"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Signal {
+            name: "visibilityChanged"
+            revision: 1
+            Parameter { name: "visibility"; type: "QWindow::Visibility" }
+        }
+        Signal { name: "activeChanged"; revision: 1 }
+        Signal {
+            name: "contentOrientationChanged"
+            Parameter { name: "orientation"; type: "Qt::ScreenOrientation" }
+        }
+        Signal {
+            name: "focusObjectChanged"
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Signal {
+            name: "opacityChanged"
+            revision: 1
+            Parameter { name: "opacity"; type: "double" }
+        }
+        Method { name: "requestActivate"; revision: 1 }
+        Method {
+            name: "setVisible"
+            Parameter { name: "visible"; type: "bool" }
+        }
+        Method { name: "show" }
+        Method { name: "hide" }
+        Method { name: "showMinimized" }
+        Method { name: "showMaximized" }
+        Method { name: "showFullScreen" }
+        Method { name: "showNormal" }
+        Method { name: "close"; type: "bool" }
+        Method { name: "raise" }
+        Method { name: "lower" }
+        Method {
+            name: "setTitle"
+            Parameter { type: "string" }
+        }
+        Method {
+            name: "setX"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setY"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setWidth"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setHeight"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setMinimumWidth"
+            Parameter { name: "w"; type: "int" }
+        }
+        Method {
+            name: "setMinimumHeight"
+            Parameter { name: "h"; type: "int" }
+        }
+        Method {
+            name: "setMaximumWidth"
+            Parameter { name: "w"; type: "int" }
+        }
+        Method {
+            name: "setMaximumHeight"
+            Parameter { name: "h"; type: "int" }
+        }
+        Method {
+            name: "alert"
+            revision: 1
+            Parameter { name: "msec"; type: "int" }
+        }
+        Method { name: "requestUpdate"; revision: 3 }
+    }
+    Component {
         name: "QQuickApplicationWindowAttached"
         prototype: "QObject"
         Property { name: "window"; type: "QQuickApplicationWindow"; isReadonly: true; isPointer: true }
diff --git a/tests/auto/sanity/BLACKLIST b/tests/auto/sanity/BLACKLIST
index 5a000c5c..ffff0c96 100644
--- a/tests/auto/sanity/BLACKLIST
+++ b/tests/auto/sanity/BLACKLIST
@@ -1,3 +1,5 @@
+[signalHandlers:material/SpinBox.qml]
+*
 [signalHandlers:material/TextArea.qml]
 *
 [signalHandlers:material/TextField.qml]