diff options
-rw-r--r-- | examples/examples.pro | 5 | ||||
-rw-r--r-- | examples/quickcontrols/controls/basiclayouts/basiclayouts.pro | 15 | ||||
-rw-r--r-- | examples/quickcontrols/controls/basiclayouts/basiclayouts.qmlproject (renamed from examples/quick/controls/touch/touch.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/basiclayouts/main.qml | 135 | ||||
-rw-r--r-- | examples/quickcontrols/controls/basiclayouts/resources.qrc (renamed from examples/quick/controls/tableview/tableview.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/basiclayouts/src/main.cpp (renamed from examples/quick/controls/touch/src/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/basiclayouts/src/src.pri (renamed from examples/quick/controls/touch/src/src.pri) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/calendar.pro (renamed from examples/quick/controls/calendar/calendar.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/images/eventindicator.png (renamed from examples/quick/controls/calendar/images/eventindicator.png) | bin | 2914 -> 2914 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/calendar/qml/main.qml (renamed from examples/quick/controls/calendar/qml/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/resources.qrc (renamed from examples/quick/controls/calendar/resources.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/src/event.cpp (renamed from examples/quick/controls/calendar/src/event.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/src/event.h (renamed from examples/quick/controls/calendar/src/event.h) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/src/main.cpp (renamed from examples/quick/controls/calendar/src/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/src/sqleventmodel.cpp (renamed from examples/quick/controls/calendar/src/sqleventmodel.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/src/sqleventmodel.h (renamed from examples/quick/controls/calendar/src/sqleventmodel.h) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/calendar/src/src.pri (renamed from examples/quick/controls/calendar/src/src.pri) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/controls.pro (renamed from examples/quick/controls/controls.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/filesystembrowser/filesystembrowser.pro (renamed from examples/quick/controls/filesystembrowser/filesystembrowser.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/filesystembrowser/main.cpp (renamed from examples/quick/controls/filesystembrowser/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/filesystembrowser/main.qml (renamed from examples/quick/controls/filesystembrowser/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/filesystembrowser/qml.qrc (renamed from examples/quick/controls/filesystembrowser/qml.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/gallery.pro (renamed from examples/quick/controls/gallery/gallery.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/gallery.qrc (renamed from examples/quick/controls/gallery/gallery.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/main.cpp (renamed from examples/quick/controls/gallery/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/main.qml (renamed from examples/quick/controls/gallery/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/qml/+android/UI.js (renamed from examples/quick/controls/gallery/qml/+android/UI.js) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/qml/+ios/UI.js (renamed from examples/quick/controls/gallery/qml/+ios/UI.js) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/qml/+osx/UI.js (renamed from examples/quick/controls/gallery/qml/+osx/UI.js) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/qml/ButtonPage.qml (renamed from examples/quick/controls/gallery/qml/ButtonPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/qml/InputPage.qml (renamed from examples/quick/controls/gallery/qml/InputPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/qml/ProgressPage.qml (renamed from examples/quick/controls/gallery/qml/ProgressPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/gallery/qml/UI.js (renamed from examples/quick/controls/gallery/qml/UI.js) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/shared/qtquickcontrolsapplication.h (renamed from examples/quick/controls/shared/qtquickcontrolsapplication.h) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/shared/shared.pri (renamed from examples/quick/controls/shared/shared.pri) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/bubble.png (renamed from examples/quick/controls/styles/images/bubble.png) | bin | 214 -> 214 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/button-pressed.png (renamed from examples/quick/controls/styles/images/button-pressed.png) | bin | 3094 -> 3094 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/button.png (renamed from examples/quick/controls/styles/images/button.png) | bin | 3164 -> 3164 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/progress-background.png (renamed from examples/quick/controls/styles/images/progress-background.png) | bin | 456 -> 456 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/progress-fill.png (renamed from examples/quick/controls/styles/images/progress-fill.png) | bin | 507 -> 507 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/slider-handle.png (renamed from examples/quick/controls/styles/images/slider-handle.png) | bin | 3523 -> 3523 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/tab.png (renamed from examples/quick/controls/styles/images/tab.png) | bin | 9877 -> 9877 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/tab_selected.png (renamed from examples/quick/controls/styles/images/tab_selected.png) | bin | 10184 -> 10184 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/images/textfield.png (renamed from examples/quick/controls/styles/images/textfield.png) | bin | 3023 -> 3023 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/styles/main.cpp (renamed from examples/quick/controls/styles/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/styles/main.qml (renamed from examples/quick/controls/styles/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/styles/styles.pro (renamed from examples/quick/controls/styles/styles.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/styles/styles.qrc (renamed from examples/quick/controls/styles/styles.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/tableview/main.qml (renamed from examples/quick/controls/tableview/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/tableview/src/main.cpp (renamed from examples/quick/controls/tableview/src/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp (renamed from examples/quick/controls/tableview/src/sortfilterproxymodel.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.h (renamed from examples/quick/controls/tableview/src/sortfilterproxymodel.h) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/tableview/src/src.pri (renamed from examples/quick/controls/tableview/src/src.pri) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/tableview/tableview.pro (renamed from examples/quick/controls/tableview/tableview.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/tableview/tableview.qrc | 5 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/example.html (renamed from examples/quick/controls/texteditor/example.html) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/ToolBarSeparator.qml (renamed from examples/quick/controls/texteditor/qml/ToolBarSeparator.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/editcopy.png (renamed from examples/quick/controls/texteditor/qml/images/editcopy.png) | bin | 1468 -> 1468 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/editcut.png (renamed from examples/quick/controls/texteditor/qml/images/editcut.png) | bin | 1512 -> 1512 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/editpaste.png (renamed from examples/quick/controls/texteditor/qml/images/editpaste.png) | bin | 1906 -> 1906 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/editredo.png (renamed from examples/quick/controls/texteditor/qml/images/editredo.png) | bin | 1752 -> 1752 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/editundo.png (renamed from examples/quick/controls/texteditor/qml/images/editundo.png) | bin | 1746 -> 1746 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/exportpdf.png (renamed from examples/quick/controls/texteditor/qml/images/exportpdf.png) | bin | 1215 -> 1215 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/filenew.png (renamed from examples/quick/controls/texteditor/qml/images/filenew.png) | bin | 1172 -> 1172 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/fileopen.png (renamed from examples/quick/controls/texteditor/qml/images/fileopen.png) | bin | 2168 -> 2168 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/fileprint.png (renamed from examples/quick/controls/texteditor/qml/images/fileprint.png) | bin | 2087 -> 2087 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/filesave.png (renamed from examples/quick/controls/texteditor/qml/images/filesave.png) | bin | 1206 -> 1206 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/qt-logo.png (renamed from examples/quick/controls/texteditor/qml/images/qt-logo.png) | bin | 3531 -> 3531 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/textbold.png (renamed from examples/quick/controls/texteditor/qml/images/textbold.png) | bin | 1611 -> 1611 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/textcenter.png (renamed from examples/quick/controls/texteditor/qml/images/textcenter.png) | bin | 1404 -> 1404 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/textitalic.png (renamed from examples/quick/controls/texteditor/qml/images/textitalic.png) | bin | 1164 -> 1164 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/textjustify.png (renamed from examples/quick/controls/texteditor/qml/images/textjustify.png) | bin | 1257 -> 1257 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/textleft.png (renamed from examples/quick/controls/texteditor/qml/images/textleft.png) | bin | 1235 -> 1235 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/textright.png (renamed from examples/quick/controls/texteditor/qml/images/textright.png) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/textunder.png (renamed from examples/quick/controls/texteditor/qml/images/textunder.png) | bin | 1183 -> 1183 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/zoomin.png (renamed from examples/quick/controls/texteditor/qml/images/zoomin.png) | bin | 1696 -> 1696 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/images/zoomout.png (renamed from examples/quick/controls/texteditor/qml/images/zoomout.png) | bin | 1662 -> 1662 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/qml/main.qml (renamed from examples/quick/controls/texteditor/qml/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/resources.qrc (renamed from examples/quick/controls/texteditor/resources.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/src/documenthandler.cpp (renamed from examples/quick/controls/texteditor/src/documenthandler.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/src/documenthandler.h (renamed from examples/quick/controls/texteditor/src/documenthandler.h) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/src/main.cpp (renamed from examples/quick/controls/texteditor/src/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/src/src.pri (renamed from examples/quick/controls/texteditor/src/src.pri) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/texteditor/texteditor.pro (renamed from examples/quick/controls/texteditor/texteditor.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/content/AndroidDelegate.qml (renamed from examples/quick/controls/touch/content/AndroidDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/content/ButtonPage.qml (renamed from examples/quick/controls/touch/content/ButtonPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/content/ListPage.qml (renamed from examples/quick/controls/touch/content/ListPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/content/ProgressBarPage.qml (renamed from examples/quick/controls/touch/content/ProgressBarPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/content/SliderPage.qml (renamed from examples/quick/controls/touch/content/SliderPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/content/TabBarPage.qml (renamed from examples/quick/controls/touch/content/TabBarPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/content/TextInputPage.qml (renamed from examples/quick/controls/touch/content/TextInputPage.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/NOTICE.txt (renamed from examples/quick/controls/touch/images/NOTICE.txt) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/button_default.png (renamed from examples/quick/controls/touch/images/button_default.png) | bin | 1406 -> 1406 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/button_pressed.png (renamed from examples/quick/controls/touch/images/button_pressed.png) | bin | 1694 -> 1694 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/navigation_next_item.png (renamed from examples/quick/controls/touch/images/navigation_next_item.png) | bin | 1341 -> 1341 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/navigation_previous_item.png (renamed from examples/quick/controls/touch/images/navigation_previous_item.png) | bin | 1343 -> 1343 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/tab_selected.png (renamed from examples/quick/controls/touch/images/tab_selected.png) | bin | 217 -> 217 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/tabs_standard.png (renamed from examples/quick/controls/touch/images/tabs_standard.png) | bin | 1230 -> 1230 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/textinput.png (renamed from examples/quick/controls/touch/images/textinput.png) | bin | 4132 -> 4132 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/touch/images/toolbar.png (renamed from examples/quick/controls/touch/images/toolbar.png) | bin | 1643 -> 1643 bytes | |||
-rw-r--r-- | examples/quickcontrols/controls/touch/main.qml (renamed from examples/quick/controls/touch/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/resources.qrc (renamed from examples/quick/controls/touch/resources.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/src/main.cpp | 51 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/src/src.pri | 2 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/touch.pro (renamed from examples/quick/controls/touch/touch.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/touch/touch.qmlproject | 16 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/MainForm.ui.qml (renamed from examples/quick/controls/uiforms/MainForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/main.cpp (renamed from examples/quick/controls/uiforms/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/main.qml (renamed from examples/quick/controls/uiforms/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/qml/CustomerModel.qml (renamed from examples/quick/controls/uiforms/qml/CustomerModel.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/qml/History.qml (renamed from examples/quick/controls/uiforms/qml/History.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/qml/HistoryForm.ui.qml (renamed from examples/quick/controls/uiforms/qml/HistoryForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/qml/Notes.qml (renamed from examples/quick/controls/uiforms/qml/Notes.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/qml/NotesForm.ui.qml (renamed from examples/quick/controls/uiforms/qml/NotesForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/qml/Settings.qml (renamed from examples/quick/controls/uiforms/qml/Settings.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/qml/SettingsForm.ui.qml (renamed from examples/quick/controls/uiforms/qml/SettingsForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/uiforms.pro (renamed from examples/quick/controls/uiforms/uiforms.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/controls/uiforms/uiforms.qrc (renamed from examples/quick/controls/uiforms/uiforms.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/dialogs.pro (renamed from examples/quick/dialogs/dialogs.pro) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/ColorDialogs.qml (renamed from examples/quick/dialogs/systemdialogs/ColorDialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/CustomDialogs.qml (renamed from examples/quick/dialogs/systemdialogs/CustomDialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/FileDialogs.qml (renamed from examples/quick/dialogs/systemdialogs/FileDialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/FontDialogs.qml (renamed from examples/quick/dialogs/systemdialogs/FontDialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/MessageDialogs.qml (renamed from examples/quick/dialogs/systemdialogs/MessageDialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg (renamed from examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg) | bin | 47413 -> 47413 bytes | |||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc (renamed from examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/main.cpp (renamed from examples/quick/dialogs/systemdialogs/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/systemdialogs.pro (renamed from examples/quick/dialogs/systemdialogs/systemdialogs.pro) | 2 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qml (renamed from examples/quick/dialogs/systemdialogs/systemdialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qrc (renamed from examples/quick/dialogs/systemdialogs/systemdialogs.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/dashboard.pro (renamed from examples/quick/extras/dashboard/dashboard.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/dashboard.qrc (renamed from examples/quick/extras/dashboard/dashboard.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/fonts/DejaVuSans.ttf (renamed from examples/quick/extras/dashboard/fonts/DejaVuSans.ttf) | bin | 720856 -> 720856 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/fonts/LICENSE (renamed from examples/quick/extras/dashboard/fonts/LICENSE) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/images/fuel-icon.png (renamed from examples/quick/extras/dashboard/images/fuel-icon.png) | bin | 409 -> 409 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/images/temperature-icon.png (renamed from examples/quick/extras/dashboard/images/temperature-icon.png) | bin | 3302 -> 3302 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/main.cpp (renamed from examples/quick/extras/dashboard/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml (renamed from examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/qml/IconGaugeStyle.qml (renamed from examples/quick/extras/dashboard/qml/IconGaugeStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/qml/TachometerStyle.qml (renamed from examples/quick/extras/dashboard/qml/TachometerStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/qml/TurnIndicator.qml (renamed from examples/quick/extras/dashboard/qml/TurnIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/qml/ValueSource.qml (renamed from examples/quick/extras/dashboard/qml/ValueSource.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/dashboard/qml/dashboard.qml (renamed from examples/quick/extras/dashboard/qml/dashboard.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/extras.pro (renamed from examples/quick/extras/extras.pro) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/flat/Content.qml (renamed from examples/quick/extras/flat/Content.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/flat/SettingsIcon.qml (renamed from examples/quick/extras/flat/SettingsIcon.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/flat/flat.pro (renamed from examples/quick/extras/flat/flat.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/extras/flat/flat.qrc (renamed from examples/quick/extras/flat/flat.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png (renamed from examples/quick/extras/flat/images/piemenu-bw-normal.png) | bin | 1716 -> 1716 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png (renamed from examples/quick/extras/flat/images/piemenu-bw-pressed.png) | bin | 1394 -> 1394 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg (renamed from examples/quick/extras/flat/images/piemenu-image-bw.jpg) | bin | 1065560 -> 1065560 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg (renamed from examples/quick/extras/flat/images/piemenu-image-rgb.jpg) | bin | 1152261 -> 1152261 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg (renamed from examples/quick/extras/flat/images/piemenu-image-sepia.jpg) | bin | 1513238 -> 1513238 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png (renamed from examples/quick/extras/flat/images/piemenu-rgb-normal.png) | bin | 1665 -> 1665 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png (renamed from examples/quick/extras/flat/images/piemenu-rgb-pressed.png) | bin | 1571 -> 1571 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png (renamed from examples/quick/extras/flat/images/piemenu-sepia-normal.png) | bin | 1410 -> 1410 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png (renamed from examples/quick/extras/flat/images/piemenu-sepia-pressed.png) | bin | 1386 -> 1386 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/flat/main.cpp (renamed from examples/quick/extras/flat/main.cpp) | 5 | ||||
-rw-r--r-- | examples/quickcontrols/extras/flat/main.qml (renamed from examples/quick/extras/flat/main.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/fonts/LICENSE.txt (renamed from examples/quick/extras/gallery/fonts/LICENSE.txt) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/fonts/OpenSans-Regular.ttf (renamed from examples/quick/extras/gallery/fonts/OpenSans-Regular.ttf) | bin | 217360 -> 217360 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/gallery.pro (renamed from examples/quick/extras/gallery/gallery.pro) | 3 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/gallery.qrc (renamed from examples/quick/extras/gallery/gallery.qrc) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/background-light.png (renamed from examples/quick/extras/gallery/images/background-light.png) | bin | 46832 -> 46832 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/background.png (renamed from examples/quick/extras/gallery/images/background.png) | bin | 45497 -> 45497 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/center-light.png (renamed from examples/quick/extras/gallery/images/center-light.png) | bin | 2113 -> 2113 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/center.png (renamed from examples/quick/extras/gallery/images/center.png) | bin | 2260 -> 2260 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/icon-back.png (renamed from examples/quick/extras/gallery/images/icon-back.png) | bin | 614 -> 614 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/icon-go.png (renamed from examples/quick/extras/gallery/images/icon-go.png) | bin | 1435 -> 1435 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/icon-settings.png (renamed from examples/quick/extras/gallery/images/icon-settings.png) | bin | 1786 -> 1786 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/info.png (renamed from examples/quick/extras/gallery/images/info.png) | bin | 709 -> 709 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/needle-light.png (renamed from examples/quick/extras/gallery/images/needle-light.png) | bin | 2105 -> 2105 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/needle.png (renamed from examples/quick/extras/gallery/images/needle.png) | bin | 4891 -> 4891 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/qt-logo.png (renamed from examples/quick/extras/gallery/images/qt-logo.png) | bin | 5149 -> 5149 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/zoom_in.png (renamed from examples/quick/extras/gallery/images/zoom_in.png) | bin | 829 -> 829 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/images/zoom_out.png (renamed from examples/quick/extras/gallery/images/zoom_out.png) | bin | 779 -> 779 bytes | |||
-rw-r--r-- | examples/quickcontrols/extras/gallery/main.cpp (renamed from examples/quick/extras/gallery/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/BlackButtonBackground.qml (renamed from examples/quick/extras/gallery/qml/BlackButtonBackground.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/BlackButtonStyle.qml (renamed from examples/quick/extras/gallery/qml/BlackButtonStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/CircularGaugeDarkStyle.qml (renamed from examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/CircularGaugeDefaultStyle.qml (renamed from examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/CircularGaugeLightStyle.qml (renamed from examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/CircularGaugeView.qml (renamed from examples/quick/extras/gallery/qml/CircularGaugeView.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/ControlLabel.qml (renamed from examples/quick/extras/gallery/qml/ControlLabel.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/ControlView.qml (renamed from examples/quick/extras/gallery/qml/ControlView.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/ControlViewToolbar.qml (renamed from examples/quick/extras/gallery/qml/ControlViewToolbar.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/CustomizerLabel.qml (renamed from examples/quick/extras/gallery/qml/CustomizerLabel.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/CustomizerSlider.qml (renamed from examples/quick/extras/gallery/qml/CustomizerSlider.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/CustomizerSwitch.qml (renamed from examples/quick/extras/gallery/qml/CustomizerSwitch.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/FlickableMoreIndicator.qml (renamed from examples/quick/extras/gallery/qml/FlickableMoreIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/PieMenuControlView.qml (renamed from examples/quick/extras/gallery/qml/PieMenuControlView.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/PieMenuDarkStyle.qml (renamed from examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/PieMenuDefaultStyle.qml (renamed from examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/StylePicker.qml (renamed from examples/quick/extras/gallery/qml/StylePicker.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/extras/gallery/qml/gallery.qml (renamed from examples/quick/extras/gallery/qml/gallery.qml) | 0 | ||||
-rw-r--r-- | examples/quickcontrols/quickcontrols.pro | 5 | ||||
-rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 5 | ||||
-rw-r--r-- | src/controls/Private/qquickstyleitem.cpp | 1 | ||||
-rw-r--r-- | src/controls/Styles/Android/plugin.cpp | 2 | ||||
-rw-r--r-- | src/controls/Styles/Base/DialStyle.qml | 4 | ||||
-rw-r--r-- | src/controls/doc/qtquickcontrols.qdocconf | 6 | ||||
-rw-r--r-- | src/controls/plugin.h | 2 | ||||
-rw-r--r-- | src/controls/qmldir | 1 | ||||
-rw-r--r-- | src/dialogs/DefaultDialogWrapper.qml | 22 | ||||
-rw-r--r-- | src/dialogs/Private/dialogsprivateplugin.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/doc/qtquickdialogs.qdocconf | 4 | ||||
-rw-r--r-- | src/dialogs/doc/src/qtquickdialogs-index.qdoc | 8 | ||||
-rw-r--r-- | src/dialogs/plugin.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/qquickabstractdialog.cpp | 13 | ||||
-rw-r--r-- | src/dialogs/qquickdialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/qquickplatformcolordialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/qquickplatformfiledialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/qquickplatformfontdialog.cpp | 2 | ||||
-rw-r--r-- | src/dialogs/qquickplatformmessagedialog.cpp | 2 | ||||
-rw-r--r-- | src/extras/Private/qquickmousethief_p.h | 3 | ||||
-rw-r--r-- | src/extras/Styles/Flat/flatstyleplugin.h | 2 | ||||
-rw-r--r-- | src/extras/doc/qtquickextras.qdocconf | 4 | ||||
-rw-r--r-- | src/extras/plugin.h | 2 | ||||
-rw-r--r-- | src/widgets/widgetsplugin.cpp | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_treeview.qml | 1 | ||||
-rw-r--r-- | tests/auto/dialogs/data/DialogImplicitSize.qml | 60 | ||||
-rw-r--r-- | tests/auto/dialogs/data/DialogMinimumSize.qml | 63 | ||||
-rw-r--r-- | tests/auto/dialogs/dialogs.pro | 2 | ||||
-rw-r--r-- | tests/auto/dialogs/tst_dialogs.cpp | 61 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_circulartickmarklabel.qml | 2 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_common.qml | 19 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_delaybutton.qml | 2 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_dial.qml | 12 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_gauge.qml | 4 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_picture.qml | 2 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_statusindicator.qml | 2 | ||||
-rw-r--r-- | tests/auto/extras/data/tst_togglebutton.qml | 2 | ||||
-rw-r--r-- | tests/auto/testplugin/testplugin.h | 2 | ||||
-rw-r--r-- | tests/auto/testplugin/testplugin.pro | 9 |
234 files changed, 540 insertions, 75 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index c80af37f0..a561399ae 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,5 +1,2 @@ TEMPLATE = subdirs - -SUBDIRS += quick/controls -SUBDIRS += quick/dialogs -SUBDIRS += quick/extras +SUBDIRS = quickcontrols diff --git a/examples/quickcontrols/controls/basiclayouts/basiclayouts.pro b/examples/quickcontrols/controls/basiclayouts/basiclayouts.pro new file mode 100644 index 000000000..202a899fa --- /dev/null +++ b/examples/quickcontrols/controls/basiclayouts/basiclayouts.pro @@ -0,0 +1,15 @@ +QT += qml quick +TARGET = basiclayouts +!no_desktop: QT += widgets + +include(src/src.pri) +include(../shared/shared.pri) + +OTHER_FILES += \ + main.qml + +RESOURCES += \ + resources.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/basiclayouts +INSTALLS += target diff --git a/examples/quick/controls/touch/touch.qmlproject b/examples/quickcontrols/controls/basiclayouts/basiclayouts.qmlproject index e5a8bf02c..e5a8bf02c 100644 --- a/examples/quick/controls/touch/touch.qmlproject +++ b/examples/quickcontrols/controls/basiclayouts/basiclayouts.qmlproject diff --git a/examples/quickcontrols/controls/basiclayouts/main.qml b/examples/quickcontrols/controls/basiclayouts/main.qml new file mode 100644 index 000000000..b6694b454 --- /dev/null +++ b/examples/quickcontrols/controls/basiclayouts/main.qml @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.2 +import QtQuick.Controls 1.2 +import QtQuick.Layouts 1.3 + +ApplicationWindow { + visible: true + title: "Basic layouts" + property int margin: 11 + width: mainLayout.implicitWidth + 2 * margin + height: mainLayout.implicitHeight + 2 * margin + minimumWidth: mainLayout.Layout.minimumWidth + 2 * margin + minimumHeight: mainLayout.Layout.minimumHeight + 2 * margin + + ColumnLayout { + id: mainLayout + anchors.fill: parent + anchors.margins: margin + GroupBox { + id: rowBox + title: "Row layout" + Layout.fillWidth: true + + RowLayout { + id: rowLayout + anchors.fill: parent + TextField { + placeholderText: "This wants to grow horizontally" + Layout.fillWidth: true + } + Button { + text: "Button" + } + } + } + + GroupBox { + id: gridBox + title: "Grid layout" + Layout.fillWidth: true + + GridLayout { + id: gridLayout + rows: 3 + flow: GridLayout.TopToBottom + anchors.fill: parent + + Label { text: "Line 1" } + Label { text: "Line 2" } + Label { text: "Line 3" } + + TextField { } + TextField { } + TextField { } + + TextArea { + text: "This widget spans over three rows in the GridLayout.\n" + + "All items in the GridLayout are implicitly positioned from top to bottom." + Layout.rowSpan: 3 + Layout.fillHeight: true + Layout.fillWidth: true + } + } + } + TextArea { + id: t3 + text: "This fills the whole cell" + Layout.minimumHeight: 30 + Layout.fillHeight: true + Layout.fillWidth: true + } + GroupBox { + id: stackBox + title: "Stack layout" + implicitWidth: 200 + implicitHeight: 60 + Layout.fillWidth: true + Layout.fillHeight: true + StackLayout { + id: stackLayout + anchors.fill: parent + + function advance() { currentIndex = (currentIndex + 1) % count } + + Repeater { + id: stackRepeater + model: 5 + Rectangle { + color: Qt.hsla((0.5 + index)/stackRepeater.count, 0.3, 0.7, 1) + Button { anchors.centerIn: parent; text: "Page " + (index + 1); onClicked: { stackLayout.advance() } } + } + } + } + } + } +} diff --git a/examples/quick/controls/tableview/tableview.qrc b/examples/quickcontrols/controls/basiclayouts/resources.qrc index 3b111a907..3b111a907 100644 --- a/examples/quick/controls/tableview/tableview.qrc +++ b/examples/quickcontrols/controls/basiclayouts/resources.qrc diff --git a/examples/quick/controls/touch/src/main.cpp b/examples/quickcontrols/controls/basiclayouts/src/main.cpp index f1b6ca77b..f1b6ca77b 100644 --- a/examples/quick/controls/touch/src/main.cpp +++ b/examples/quickcontrols/controls/basiclayouts/src/main.cpp diff --git a/examples/quick/controls/touch/src/src.pri b/examples/quickcontrols/controls/basiclayouts/src/src.pri index 66d903eac..66d903eac 100644 --- a/examples/quick/controls/touch/src/src.pri +++ b/examples/quickcontrols/controls/basiclayouts/src/src.pri diff --git a/examples/quick/controls/calendar/calendar.pro b/examples/quickcontrols/controls/calendar/calendar.pro index e5bee1e97..67960e275 100644 --- a/examples/quick/controls/calendar/calendar.pro +++ b/examples/quickcontrols/controls/calendar/calendar.pro @@ -9,3 +9,6 @@ include(../shared/shared.pri) OTHER_FILES += qml/main.qml RESOURCES += resources.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/calendar +INSTALLS += target diff --git a/examples/quick/controls/calendar/images/eventindicator.png b/examples/quickcontrols/controls/calendar/images/eventindicator.png Binary files differindex 1edffd02d..1edffd02d 100644 --- a/examples/quick/controls/calendar/images/eventindicator.png +++ b/examples/quickcontrols/controls/calendar/images/eventindicator.png diff --git a/examples/quick/controls/calendar/qml/main.qml b/examples/quickcontrols/controls/calendar/qml/main.qml index 5c4c10e87..5c4c10e87 100644 --- a/examples/quick/controls/calendar/qml/main.qml +++ b/examples/quickcontrols/controls/calendar/qml/main.qml diff --git a/examples/quick/controls/calendar/resources.qrc b/examples/quickcontrols/controls/calendar/resources.qrc index 9da283ba3..9da283ba3 100644 --- a/examples/quick/controls/calendar/resources.qrc +++ b/examples/quickcontrols/controls/calendar/resources.qrc diff --git a/examples/quick/controls/calendar/src/event.cpp b/examples/quickcontrols/controls/calendar/src/event.cpp index 3e5f641e7..3e5f641e7 100644 --- a/examples/quick/controls/calendar/src/event.cpp +++ b/examples/quickcontrols/controls/calendar/src/event.cpp diff --git a/examples/quick/controls/calendar/src/event.h b/examples/quickcontrols/controls/calendar/src/event.h index 8e7b3284e..8e7b3284e 100644 --- a/examples/quick/controls/calendar/src/event.h +++ b/examples/quickcontrols/controls/calendar/src/event.h diff --git a/examples/quick/controls/calendar/src/main.cpp b/examples/quickcontrols/controls/calendar/src/main.cpp index c9613d5fe..c9613d5fe 100644 --- a/examples/quick/controls/calendar/src/main.cpp +++ b/examples/quickcontrols/controls/calendar/src/main.cpp diff --git a/examples/quick/controls/calendar/src/sqleventmodel.cpp b/examples/quickcontrols/controls/calendar/src/sqleventmodel.cpp index d7cad179a..d7cad179a 100644 --- a/examples/quick/controls/calendar/src/sqleventmodel.cpp +++ b/examples/quickcontrols/controls/calendar/src/sqleventmodel.cpp diff --git a/examples/quick/controls/calendar/src/sqleventmodel.h b/examples/quickcontrols/controls/calendar/src/sqleventmodel.h index 788dbf2ac..788dbf2ac 100644 --- a/examples/quick/controls/calendar/src/sqleventmodel.h +++ b/examples/quickcontrols/controls/calendar/src/sqleventmodel.h diff --git a/examples/quick/controls/calendar/src/src.pri b/examples/quickcontrols/controls/calendar/src/src.pri index 50b2ea620..50b2ea620 100644 --- a/examples/quick/controls/calendar/src/src.pri +++ b/examples/quickcontrols/controls/calendar/src/src.pri diff --git a/examples/quick/controls/controls.pro b/examples/quickcontrols/controls/controls.pro index 57c679c9d..381e71408 100644 --- a/examples/quick/controls/controls.pro +++ b/examples/quickcontrols/controls/controls.pro @@ -14,3 +14,6 @@ qtHaveModule(widgets) { qtHaveModule(sql) { SUBDIRS += calendar } + +EXAMPLE_FILES += \ + shared diff --git a/examples/quick/controls/filesystembrowser/filesystembrowser.pro b/examples/quickcontrols/controls/filesystembrowser/filesystembrowser.pro index bf77d958f..fc14584cd 100644 --- a/examples/quick/controls/filesystembrowser/filesystembrowser.pro +++ b/examples/quickcontrols/controls/filesystembrowser/filesystembrowser.pro @@ -5,3 +5,6 @@ QT += qml quick widgets SOURCES += main.cpp RESOURCES += qml.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/filesystembrowser +INSTALLS += target diff --git a/examples/quick/controls/filesystembrowser/main.cpp b/examples/quickcontrols/controls/filesystembrowser/main.cpp index 6027c828d..6027c828d 100644 --- a/examples/quick/controls/filesystembrowser/main.cpp +++ b/examples/quickcontrols/controls/filesystembrowser/main.cpp diff --git a/examples/quick/controls/filesystembrowser/main.qml b/examples/quickcontrols/controls/filesystembrowser/main.qml index b07b842bc..b07b842bc 100644 --- a/examples/quick/controls/filesystembrowser/main.qml +++ b/examples/quickcontrols/controls/filesystembrowser/main.qml diff --git a/examples/quick/controls/filesystembrowser/qml.qrc b/examples/quickcontrols/controls/filesystembrowser/qml.qrc index 5f6483ac3..5f6483ac3 100644 --- a/examples/quick/controls/filesystembrowser/qml.qrc +++ b/examples/quickcontrols/controls/filesystembrowser/qml.qrc diff --git a/examples/quick/controls/gallery/gallery.pro b/examples/quickcontrols/controls/gallery/gallery.pro index f13f42135..5cba235da 100644 --- a/examples/quick/controls/gallery/gallery.pro +++ b/examples/quickcontrols/controls/gallery/gallery.pro @@ -18,3 +18,6 @@ OTHER_FILES += \ qml/+osx/UI.js include(../shared/shared.pri) + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/gallery +INSTALLS += target diff --git a/examples/quick/controls/gallery/gallery.qrc b/examples/quickcontrols/controls/gallery/gallery.qrc index 873c8b5ca..873c8b5ca 100644 --- a/examples/quick/controls/gallery/gallery.qrc +++ b/examples/quickcontrols/controls/gallery/gallery.qrc diff --git a/examples/quick/controls/gallery/main.cpp b/examples/quickcontrols/controls/gallery/main.cpp index adcdfe529..adcdfe529 100644 --- a/examples/quick/controls/gallery/main.cpp +++ b/examples/quickcontrols/controls/gallery/main.cpp diff --git a/examples/quick/controls/gallery/main.qml b/examples/quickcontrols/controls/gallery/main.qml index a8bbbaf21..a8bbbaf21 100644 --- a/examples/quick/controls/gallery/main.qml +++ b/examples/quickcontrols/controls/gallery/main.qml diff --git a/examples/quick/controls/gallery/qml/+android/UI.js b/examples/quickcontrols/controls/gallery/qml/+android/UI.js index be7ddfa96..be7ddfa96 100644 --- a/examples/quick/controls/gallery/qml/+android/UI.js +++ b/examples/quickcontrols/controls/gallery/qml/+android/UI.js diff --git a/examples/quick/controls/gallery/qml/+ios/UI.js b/examples/quickcontrols/controls/gallery/qml/+ios/UI.js index be7ddfa96..be7ddfa96 100644 --- a/examples/quick/controls/gallery/qml/+ios/UI.js +++ b/examples/quickcontrols/controls/gallery/qml/+ios/UI.js diff --git a/examples/quick/controls/gallery/qml/+osx/UI.js b/examples/quickcontrols/controls/gallery/qml/+osx/UI.js index 28b13b64a..28b13b64a 100644 --- a/examples/quick/controls/gallery/qml/+osx/UI.js +++ b/examples/quickcontrols/controls/gallery/qml/+osx/UI.js diff --git a/examples/quick/controls/gallery/qml/ButtonPage.qml b/examples/quickcontrols/controls/gallery/qml/ButtonPage.qml index 8eb9c1a73..8eb9c1a73 100644 --- a/examples/quick/controls/gallery/qml/ButtonPage.qml +++ b/examples/quickcontrols/controls/gallery/qml/ButtonPage.qml diff --git a/examples/quick/controls/gallery/qml/InputPage.qml b/examples/quickcontrols/controls/gallery/qml/InputPage.qml index 78ef0a64d..78ef0a64d 100644 --- a/examples/quick/controls/gallery/qml/InputPage.qml +++ b/examples/quickcontrols/controls/gallery/qml/InputPage.qml diff --git a/examples/quick/controls/gallery/qml/ProgressPage.qml b/examples/quickcontrols/controls/gallery/qml/ProgressPage.qml index 5123d101f..5123d101f 100644 --- a/examples/quick/controls/gallery/qml/ProgressPage.qml +++ b/examples/quickcontrols/controls/gallery/qml/ProgressPage.qml diff --git a/examples/quick/controls/gallery/qml/UI.js b/examples/quickcontrols/controls/gallery/qml/UI.js index 3899ced02..3899ced02 100644 --- a/examples/quick/controls/gallery/qml/UI.js +++ b/examples/quickcontrols/controls/gallery/qml/UI.js diff --git a/examples/quick/controls/shared/qtquickcontrolsapplication.h b/examples/quickcontrols/controls/shared/qtquickcontrolsapplication.h index 04d104442..04d104442 100644 --- a/examples/quick/controls/shared/qtquickcontrolsapplication.h +++ b/examples/quickcontrols/controls/shared/qtquickcontrolsapplication.h diff --git a/examples/quick/controls/shared/shared.pri b/examples/quickcontrols/controls/shared/shared.pri index 1d9e0592f..1d9e0592f 100644 --- a/examples/quick/controls/shared/shared.pri +++ b/examples/quickcontrols/controls/shared/shared.pri diff --git a/examples/quick/controls/styles/images/bubble.png b/examples/quickcontrols/controls/styles/images/bubble.png Binary files differindex 62aa1efe5..62aa1efe5 100644 --- a/examples/quick/controls/styles/images/bubble.png +++ b/examples/quickcontrols/controls/styles/images/bubble.png diff --git a/examples/quick/controls/styles/images/button-pressed.png b/examples/quickcontrols/controls/styles/images/button-pressed.png Binary files differindex d64cdaa78..d64cdaa78 100644 --- a/examples/quick/controls/styles/images/button-pressed.png +++ b/examples/quickcontrols/controls/styles/images/button-pressed.png diff --git a/examples/quick/controls/styles/images/button.png b/examples/quickcontrols/controls/styles/images/button.png Binary files differindex 8ab41cc80..8ab41cc80 100644 --- a/examples/quick/controls/styles/images/button.png +++ b/examples/quickcontrols/controls/styles/images/button.png diff --git a/examples/quick/controls/styles/images/progress-background.png b/examples/quickcontrols/controls/styles/images/progress-background.png Binary files differindex 55a069dfc..55a069dfc 100644 --- a/examples/quick/controls/styles/images/progress-background.png +++ b/examples/quickcontrols/controls/styles/images/progress-background.png diff --git a/examples/quick/controls/styles/images/progress-fill.png b/examples/quickcontrols/controls/styles/images/progress-fill.png Binary files differindex b588c9586..b588c9586 100644 --- a/examples/quick/controls/styles/images/progress-fill.png +++ b/examples/quickcontrols/controls/styles/images/progress-fill.png diff --git a/examples/quick/controls/styles/images/slider-handle.png b/examples/quickcontrols/controls/styles/images/slider-handle.png Binary files differindex ac4d4a0d9..ac4d4a0d9 100644 --- a/examples/quick/controls/styles/images/slider-handle.png +++ b/examples/quickcontrols/controls/styles/images/slider-handle.png diff --git a/examples/quick/controls/styles/images/tab.png b/examples/quickcontrols/controls/styles/images/tab.png Binary files differindex 74fefab78..74fefab78 100644 --- a/examples/quick/controls/styles/images/tab.png +++ b/examples/quickcontrols/controls/styles/images/tab.png diff --git a/examples/quick/controls/styles/images/tab_selected.png b/examples/quickcontrols/controls/styles/images/tab_selected.png Binary files differindex 665400ccf..665400ccf 100644 --- a/examples/quick/controls/styles/images/tab_selected.png +++ b/examples/quickcontrols/controls/styles/images/tab_selected.png diff --git a/examples/quick/controls/styles/images/textfield.png b/examples/quickcontrols/controls/styles/images/textfield.png Binary files differindex 1d4a38ab3..1d4a38ab3 100644 --- a/examples/quick/controls/styles/images/textfield.png +++ b/examples/quickcontrols/controls/styles/images/textfield.png diff --git a/examples/quick/controls/styles/main.cpp b/examples/quickcontrols/controls/styles/main.cpp index 47e9945d7..47e9945d7 100644 --- a/examples/quick/controls/styles/main.cpp +++ b/examples/quickcontrols/controls/styles/main.cpp diff --git a/examples/quick/controls/styles/main.qml b/examples/quickcontrols/controls/styles/main.qml index c77628839..c77628839 100644 --- a/examples/quick/controls/styles/main.qml +++ b/examples/quickcontrols/controls/styles/main.qml diff --git a/examples/quick/controls/styles/styles.pro b/examples/quickcontrols/controls/styles/styles.pro index 03648f4cc..b1b29951d 100644 --- a/examples/quick/controls/styles/styles.pro +++ b/examples/quickcontrols/controls/styles/styles.pro @@ -8,3 +8,6 @@ RESOURCES += \ styles.qrc OTHER_FILES += \ main.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/styles +INSTALLS += target diff --git a/examples/quick/controls/styles/styles.qrc b/examples/quickcontrols/controls/styles/styles.qrc index d2300c6fa..d2300c6fa 100644 --- a/examples/quick/controls/styles/styles.qrc +++ b/examples/quickcontrols/controls/styles/styles.qrc diff --git a/examples/quick/controls/tableview/main.qml b/examples/quickcontrols/controls/tableview/main.qml index 006fad6db..006fad6db 100644 --- a/examples/quick/controls/tableview/main.qml +++ b/examples/quickcontrols/controls/tableview/main.qml diff --git a/examples/quick/controls/tableview/src/main.cpp b/examples/quickcontrols/controls/tableview/src/main.cpp index 5292a609a..5292a609a 100644 --- a/examples/quick/controls/tableview/src/main.cpp +++ b/examples/quickcontrols/controls/tableview/src/main.cpp diff --git a/examples/quick/controls/tableview/src/sortfilterproxymodel.cpp b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp index 55f76d670..55f76d670 100644 --- a/examples/quick/controls/tableview/src/sortfilterproxymodel.cpp +++ b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp diff --git a/examples/quick/controls/tableview/src/sortfilterproxymodel.h b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.h index dbc73e847..dbc73e847 100644 --- a/examples/quick/controls/tableview/src/sortfilterproxymodel.h +++ b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.h diff --git a/examples/quick/controls/tableview/src/src.pri b/examples/quickcontrols/controls/tableview/src/src.pri index 491f851c9..491f851c9 100644 --- a/examples/quick/controls/tableview/src/src.pri +++ b/examples/quickcontrols/controls/tableview/src/src.pri diff --git a/examples/quick/controls/tableview/tableview.pro b/examples/quickcontrols/controls/tableview/tableview.pro index c0ed1a2f9..a956dc428 100644 --- a/examples/quick/controls/tableview/tableview.pro +++ b/examples/quickcontrols/controls/tableview/tableview.pro @@ -9,3 +9,6 @@ OTHER_FILES += \ include(src/src.pri) include(../shared/shared.pri) + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/tableview +INSTALLS += target diff --git a/examples/quickcontrols/controls/tableview/tableview.qrc b/examples/quickcontrols/controls/tableview/tableview.qrc new file mode 100644 index 000000000..3b111a907 --- /dev/null +++ b/examples/quickcontrols/controls/tableview/tableview.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource prefix="/"> + <file>main.qml</file> +</qresource> +</RCC> diff --git a/examples/quick/controls/texteditor/example.html b/examples/quickcontrols/controls/texteditor/example.html index 52bb507a1..52bb507a1 100644 --- a/examples/quick/controls/texteditor/example.html +++ b/examples/quickcontrols/controls/texteditor/example.html diff --git a/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml b/examples/quickcontrols/controls/texteditor/qml/ToolBarSeparator.qml index cb4ae0243..cb4ae0243 100644 --- a/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml +++ b/examples/quickcontrols/controls/texteditor/qml/ToolBarSeparator.qml diff --git a/examples/quick/controls/texteditor/qml/images/editcopy.png b/examples/quickcontrols/controls/texteditor/qml/images/editcopy.png Binary files differindex f55136446..f55136446 100644 --- a/examples/quick/controls/texteditor/qml/images/editcopy.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/editcopy.png diff --git a/examples/quick/controls/texteditor/qml/images/editcut.png b/examples/quickcontrols/controls/texteditor/qml/images/editcut.png Binary files differindex a784fd570..a784fd570 100644 --- a/examples/quick/controls/texteditor/qml/images/editcut.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/editcut.png diff --git a/examples/quick/controls/texteditor/qml/images/editpaste.png b/examples/quickcontrols/controls/texteditor/qml/images/editpaste.png Binary files differindex 64c0b2d6a..64c0b2d6a 100644 --- a/examples/quick/controls/texteditor/qml/images/editpaste.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/editpaste.png diff --git a/examples/quick/controls/texteditor/qml/images/editredo.png b/examples/quickcontrols/controls/texteditor/qml/images/editredo.png Binary files differindex 8875bf246..8875bf246 100644 --- a/examples/quick/controls/texteditor/qml/images/editredo.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/editredo.png diff --git a/examples/quick/controls/texteditor/qml/images/editundo.png b/examples/quickcontrols/controls/texteditor/qml/images/editundo.png Binary files differindex a3bd5e0bf..a3bd5e0bf 100644 --- a/examples/quick/controls/texteditor/qml/images/editundo.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/editundo.png diff --git a/examples/quick/controls/texteditor/qml/images/exportpdf.png b/examples/quickcontrols/controls/texteditor/qml/images/exportpdf.png Binary files differindex ebb44e6b8..ebb44e6b8 100644 --- a/examples/quick/controls/texteditor/qml/images/exportpdf.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/exportpdf.png diff --git a/examples/quick/controls/texteditor/qml/images/filenew.png b/examples/quickcontrols/controls/texteditor/qml/images/filenew.png Binary files differindex d3882c7b3..d3882c7b3 100644 --- a/examples/quick/controls/texteditor/qml/images/filenew.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/filenew.png diff --git a/examples/quick/controls/texteditor/qml/images/fileopen.png b/examples/quickcontrols/controls/texteditor/qml/images/fileopen.png Binary files differindex fc06c5ec6..fc06c5ec6 100644 --- a/examples/quick/controls/texteditor/qml/images/fileopen.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/fileopen.png diff --git a/examples/quick/controls/texteditor/qml/images/fileprint.png b/examples/quickcontrols/controls/texteditor/qml/images/fileprint.png Binary files differindex 10ca56c82..10ca56c82 100644 --- a/examples/quick/controls/texteditor/qml/images/fileprint.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/fileprint.png diff --git a/examples/quick/controls/texteditor/qml/images/filesave.png b/examples/quickcontrols/controls/texteditor/qml/images/filesave.png Binary files differindex b41ecf531..b41ecf531 100644 --- a/examples/quick/controls/texteditor/qml/images/filesave.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/filesave.png diff --git a/examples/quick/controls/texteditor/qml/images/qt-logo.png b/examples/quickcontrols/controls/texteditor/qml/images/qt-logo.png Binary files differindex be1bb1060..be1bb1060 100644 --- a/examples/quick/controls/texteditor/qml/images/qt-logo.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/qt-logo.png diff --git a/examples/quick/controls/texteditor/qml/images/textbold.png b/examples/quickcontrols/controls/texteditor/qml/images/textbold.png Binary files differindex 38400bd1f..38400bd1f 100644 --- a/examples/quick/controls/texteditor/qml/images/textbold.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/textbold.png diff --git a/examples/quick/controls/texteditor/qml/images/textcenter.png b/examples/quickcontrols/controls/texteditor/qml/images/textcenter.png Binary files differindex 2ef5b2ee6..2ef5b2ee6 100644 --- a/examples/quick/controls/texteditor/qml/images/textcenter.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/textcenter.png diff --git a/examples/quick/controls/texteditor/qml/images/textitalic.png b/examples/quickcontrols/controls/texteditor/qml/images/textitalic.png Binary files differindex 0170ee26a..0170ee26a 100644 --- a/examples/quick/controls/texteditor/qml/images/textitalic.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/textitalic.png diff --git a/examples/quick/controls/texteditor/qml/images/textjustify.png b/examples/quickcontrols/controls/texteditor/qml/images/textjustify.png Binary files differindex 39cd6c1a9..39cd6c1a9 100644 --- a/examples/quick/controls/texteditor/qml/images/textjustify.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/textjustify.png diff --git a/examples/quick/controls/texteditor/qml/images/textleft.png b/examples/quickcontrols/controls/texteditor/qml/images/textleft.png Binary files differindex 83a66d553..83a66d553 100644 --- a/examples/quick/controls/texteditor/qml/images/textleft.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/textleft.png diff --git a/examples/quick/controls/texteditor/qml/images/textright.png b/examples/quickcontrols/controls/texteditor/qml/images/textright.png Binary files differindex e7c04645c..e7c04645c 100644 --- a/examples/quick/controls/texteditor/qml/images/textright.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/textright.png diff --git a/examples/quick/controls/texteditor/qml/images/textunder.png b/examples/quickcontrols/controls/texteditor/qml/images/textunder.png Binary files differindex 968bac5e9..968bac5e9 100644 --- a/examples/quick/controls/texteditor/qml/images/textunder.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/textunder.png diff --git a/examples/quick/controls/texteditor/qml/images/zoomin.png b/examples/quickcontrols/controls/texteditor/qml/images/zoomin.png Binary files differindex d46f5aff0..d46f5aff0 100644 --- a/examples/quick/controls/texteditor/qml/images/zoomin.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/zoomin.png diff --git a/examples/quick/controls/texteditor/qml/images/zoomout.png b/examples/quickcontrols/controls/texteditor/qml/images/zoomout.png Binary files differindex 46326566d..46326566d 100644 --- a/examples/quick/controls/texteditor/qml/images/zoomout.png +++ b/examples/quickcontrols/controls/texteditor/qml/images/zoomout.png diff --git a/examples/quick/controls/texteditor/qml/main.qml b/examples/quickcontrols/controls/texteditor/qml/main.qml index 8aa9ee7be..8aa9ee7be 100644 --- a/examples/quick/controls/texteditor/qml/main.qml +++ b/examples/quickcontrols/controls/texteditor/qml/main.qml diff --git a/examples/quick/controls/texteditor/resources.qrc b/examples/quickcontrols/controls/texteditor/resources.qrc index 27c7b9215..27c7b9215 100644 --- a/examples/quick/controls/texteditor/resources.qrc +++ b/examples/quickcontrols/controls/texteditor/resources.qrc diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp index bdecf5ba1..bdecf5ba1 100644 --- a/examples/quick/controls/texteditor/src/documenthandler.cpp +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp diff --git a/examples/quick/controls/texteditor/src/documenthandler.h b/examples/quickcontrols/controls/texteditor/src/documenthandler.h index 682c8b5bd..682c8b5bd 100644 --- a/examples/quick/controls/texteditor/src/documenthandler.h +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.h diff --git a/examples/quick/controls/texteditor/src/main.cpp b/examples/quickcontrols/controls/texteditor/src/main.cpp index 30113bbfc..30113bbfc 100644 --- a/examples/quick/controls/texteditor/src/main.cpp +++ b/examples/quickcontrols/controls/texteditor/src/main.cpp diff --git a/examples/quick/controls/texteditor/src/src.pri b/examples/quickcontrols/controls/texteditor/src/src.pri index 2b89cd629..2b89cd629 100644 --- a/examples/quick/controls/texteditor/src/src.pri +++ b/examples/quickcontrols/controls/texteditor/src/src.pri diff --git a/examples/quick/controls/texteditor/texteditor.pro b/examples/quickcontrols/controls/texteditor/texteditor.pro index ec9d8d863..f52552555 100644 --- a/examples/quick/controls/texteditor/texteditor.pro +++ b/examples/quickcontrols/controls/texteditor/texteditor.pro @@ -11,3 +11,6 @@ OTHER_FILES += \ RESOURCES += \ resources.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/texteditor +INSTALLS += target diff --git a/examples/quick/controls/touch/content/AndroidDelegate.qml b/examples/quickcontrols/controls/touch/content/AndroidDelegate.qml index 7eb2a5fd0..7eb2a5fd0 100644 --- a/examples/quick/controls/touch/content/AndroidDelegate.qml +++ b/examples/quickcontrols/controls/touch/content/AndroidDelegate.qml diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quickcontrols/controls/touch/content/ButtonPage.qml index aa37b6676..aa37b6676 100644 --- a/examples/quick/controls/touch/content/ButtonPage.qml +++ b/examples/quickcontrols/controls/touch/content/ButtonPage.qml diff --git a/examples/quick/controls/touch/content/ListPage.qml b/examples/quickcontrols/controls/touch/content/ListPage.qml index 5f1675df1..5f1675df1 100644 --- a/examples/quick/controls/touch/content/ListPage.qml +++ b/examples/quickcontrols/controls/touch/content/ListPage.qml diff --git a/examples/quick/controls/touch/content/ProgressBarPage.qml b/examples/quickcontrols/controls/touch/content/ProgressBarPage.qml index 5cee2e337..5cee2e337 100644 --- a/examples/quick/controls/touch/content/ProgressBarPage.qml +++ b/examples/quickcontrols/controls/touch/content/ProgressBarPage.qml diff --git a/examples/quick/controls/touch/content/SliderPage.qml b/examples/quickcontrols/controls/touch/content/SliderPage.qml index 4c558f75b..4c558f75b 100644 --- a/examples/quick/controls/touch/content/SliderPage.qml +++ b/examples/quickcontrols/controls/touch/content/SliderPage.qml diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quickcontrols/controls/touch/content/TabBarPage.qml index 6e7ec69c1..6e7ec69c1 100644 --- a/examples/quick/controls/touch/content/TabBarPage.qml +++ b/examples/quickcontrols/controls/touch/content/TabBarPage.qml diff --git a/examples/quick/controls/touch/content/TextInputPage.qml b/examples/quickcontrols/controls/touch/content/TextInputPage.qml index 3a69cc188..3a69cc188 100644 --- a/examples/quick/controls/touch/content/TextInputPage.qml +++ b/examples/quickcontrols/controls/touch/content/TextInputPage.qml diff --git a/examples/quick/controls/touch/images/NOTICE.txt b/examples/quickcontrols/controls/touch/images/NOTICE.txt index 93a9afc8c..93a9afc8c 100644 --- a/examples/quick/controls/touch/images/NOTICE.txt +++ b/examples/quickcontrols/controls/touch/images/NOTICE.txt diff --git a/examples/quick/controls/touch/images/button_default.png b/examples/quickcontrols/controls/touch/images/button_default.png Binary files differindex 6d6cfd9ad..6d6cfd9ad 100644 --- a/examples/quick/controls/touch/images/button_default.png +++ b/examples/quickcontrols/controls/touch/images/button_default.png diff --git a/examples/quick/controls/touch/images/button_pressed.png b/examples/quickcontrols/controls/touch/images/button_pressed.png Binary files differindex ab78b6ea3..ab78b6ea3 100644 --- a/examples/quick/controls/touch/images/button_pressed.png +++ b/examples/quickcontrols/controls/touch/images/button_pressed.png diff --git a/examples/quick/controls/touch/images/navigation_next_item.png b/examples/quickcontrols/controls/touch/images/navigation_next_item.png Binary files differindex 6665c9d85..6665c9d85 100644 --- a/examples/quick/controls/touch/images/navigation_next_item.png +++ b/examples/quickcontrols/controls/touch/images/navigation_next_item.png diff --git a/examples/quick/controls/touch/images/navigation_previous_item.png b/examples/quickcontrols/controls/touch/images/navigation_previous_item.png Binary files differindex f8be01197..f8be01197 100644 --- a/examples/quick/controls/touch/images/navigation_previous_item.png +++ b/examples/quickcontrols/controls/touch/images/navigation_previous_item.png diff --git a/examples/quick/controls/touch/images/tab_selected.png b/examples/quickcontrols/controls/touch/images/tab_selected.png Binary files differindex 2345f7a8e..2345f7a8e 100644 --- a/examples/quick/controls/touch/images/tab_selected.png +++ b/examples/quickcontrols/controls/touch/images/tab_selected.png diff --git a/examples/quick/controls/touch/images/tabs_standard.png b/examples/quickcontrols/controls/touch/images/tabs_standard.png Binary files differindex 7140ab7b7..7140ab7b7 100644 --- a/examples/quick/controls/touch/images/tabs_standard.png +++ b/examples/quickcontrols/controls/touch/images/tabs_standard.png diff --git a/examples/quick/controls/touch/images/textinput.png b/examples/quickcontrols/controls/touch/images/textinput.png Binary files differindex b0256db2c..b0256db2c 100644 --- a/examples/quick/controls/touch/images/textinput.png +++ b/examples/quickcontrols/controls/touch/images/textinput.png diff --git a/examples/quick/controls/touch/images/toolbar.png b/examples/quickcontrols/controls/touch/images/toolbar.png Binary files differindex e9eba4c74..e9eba4c74 100644 --- a/examples/quick/controls/touch/images/toolbar.png +++ b/examples/quickcontrols/controls/touch/images/toolbar.png diff --git a/examples/quick/controls/touch/main.qml b/examples/quickcontrols/controls/touch/main.qml index bd57c40e4..bd57c40e4 100644 --- a/examples/quick/controls/touch/main.qml +++ b/examples/quickcontrols/controls/touch/main.qml diff --git a/examples/quick/controls/touch/resources.qrc b/examples/quickcontrols/controls/touch/resources.qrc index e64a063f1..e64a063f1 100644 --- a/examples/quick/controls/touch/resources.qrc +++ b/examples/quickcontrols/controls/touch/resources.qrc diff --git a/examples/quickcontrols/controls/touch/src/main.cpp b/examples/quickcontrols/controls/touch/src/main.cpp new file mode 100644 index 000000000..e66387f7b --- /dev/null +++ b/examples/quickcontrols/controls/touch/src/main.cpp @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qtquickcontrolsapplication.h" +#include <QtQml/QQmlApplicationEngine> + +int main(int argc, char *argv[]) +{ + QtQuickControlsApplication app(argc, argv); + QQmlApplicationEngine engine(QUrl("qrc:/main.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + return app.exec(); +} diff --git a/examples/quickcontrols/controls/touch/src/src.pri b/examples/quickcontrols/controls/touch/src/src.pri new file mode 100644 index 000000000..66d903eac --- /dev/null +++ b/examples/quickcontrols/controls/touch/src/src.pri @@ -0,0 +1,2 @@ +SOURCES += \ + $$PWD/main.cpp diff --git a/examples/quick/controls/touch/touch.pro b/examples/quickcontrols/controls/touch/touch.pro index 63902f81b..111c28459 100644 --- a/examples/quick/controls/touch/touch.pro +++ b/examples/quickcontrols/controls/touch/touch.pro @@ -17,3 +17,6 @@ OTHER_FILES += \ RESOURCES += \ resources.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/touch +INSTALLS += target diff --git a/examples/quickcontrols/controls/touch/touch.qmlproject b/examples/quickcontrols/controls/touch/touch.qmlproject new file mode 100644 index 000000000..e5a8bf02c --- /dev/null +++ b/examples/quickcontrols/controls/touch/touch.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.1 + +Project { + mainFile: "main.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } +} diff --git a/examples/quick/controls/uiforms/MainForm.ui.qml b/examples/quickcontrols/controls/uiforms/MainForm.ui.qml index 499e7abeb..499e7abeb 100644 --- a/examples/quick/controls/uiforms/MainForm.ui.qml +++ b/examples/quickcontrols/controls/uiforms/MainForm.ui.qml diff --git a/examples/quick/controls/uiforms/main.cpp b/examples/quickcontrols/controls/uiforms/main.cpp index a4709db88..a4709db88 100644 --- a/examples/quick/controls/uiforms/main.cpp +++ b/examples/quickcontrols/controls/uiforms/main.cpp diff --git a/examples/quick/controls/uiforms/main.qml b/examples/quickcontrols/controls/uiforms/main.qml index c0dcc019b..c0dcc019b 100644 --- a/examples/quick/controls/uiforms/main.qml +++ b/examples/quickcontrols/controls/uiforms/main.qml diff --git a/examples/quick/controls/uiforms/qml/CustomerModel.qml b/examples/quickcontrols/controls/uiforms/qml/CustomerModel.qml index ac321b2ce..ac321b2ce 100644 --- a/examples/quick/controls/uiforms/qml/CustomerModel.qml +++ b/examples/quickcontrols/controls/uiforms/qml/CustomerModel.qml diff --git a/examples/quick/controls/uiforms/qml/History.qml b/examples/quickcontrols/controls/uiforms/qml/History.qml index be7a5808b..be7a5808b 100644 --- a/examples/quick/controls/uiforms/qml/History.qml +++ b/examples/quickcontrols/controls/uiforms/qml/History.qml diff --git a/examples/quick/controls/uiforms/qml/HistoryForm.ui.qml b/examples/quickcontrols/controls/uiforms/qml/HistoryForm.ui.qml index 94512cfff..94512cfff 100644 --- a/examples/quick/controls/uiforms/qml/HistoryForm.ui.qml +++ b/examples/quickcontrols/controls/uiforms/qml/HistoryForm.ui.qml diff --git a/examples/quick/controls/uiforms/qml/Notes.qml b/examples/quickcontrols/controls/uiforms/qml/Notes.qml index c7f326f7f..c7f326f7f 100644 --- a/examples/quick/controls/uiforms/qml/Notes.qml +++ b/examples/quickcontrols/controls/uiforms/qml/Notes.qml diff --git a/examples/quick/controls/uiforms/qml/NotesForm.ui.qml b/examples/quickcontrols/controls/uiforms/qml/NotesForm.ui.qml index e30669875..e30669875 100644 --- a/examples/quick/controls/uiforms/qml/NotesForm.ui.qml +++ b/examples/quickcontrols/controls/uiforms/qml/NotesForm.ui.qml diff --git a/examples/quick/controls/uiforms/qml/Settings.qml b/examples/quickcontrols/controls/uiforms/qml/Settings.qml index eefab2a15..eefab2a15 100644 --- a/examples/quick/controls/uiforms/qml/Settings.qml +++ b/examples/quickcontrols/controls/uiforms/qml/Settings.qml diff --git a/examples/quick/controls/uiforms/qml/SettingsForm.ui.qml b/examples/quickcontrols/controls/uiforms/qml/SettingsForm.ui.qml index 00ce1ee1d..00ce1ee1d 100644 --- a/examples/quick/controls/uiforms/qml/SettingsForm.ui.qml +++ b/examples/quickcontrols/controls/uiforms/qml/SettingsForm.ui.qml diff --git a/examples/quick/controls/uiforms/uiforms.pro b/examples/quickcontrols/controls/uiforms/uiforms.pro index 08b3d0c4a..8b8a8a965 100644 --- a/examples/quick/controls/uiforms/uiforms.pro +++ b/examples/quickcontrols/controls/uiforms/uiforms.pro @@ -19,3 +19,6 @@ OTHER_FILES += \ qml/CustomerModel.qml include(../shared/shared.pri) + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/controls/uiforms +INSTALLS += target diff --git a/examples/quick/controls/uiforms/uiforms.qrc b/examples/quickcontrols/controls/uiforms/uiforms.qrc index 447bb039d..447bb039d 100644 --- a/examples/quick/controls/uiforms/uiforms.qrc +++ b/examples/quickcontrols/controls/uiforms/uiforms.qrc diff --git a/examples/quick/dialogs/dialogs.pro b/examples/quickcontrols/dialogs/dialogs.pro index 538e75686..538e75686 100644 --- a/examples/quick/dialogs/dialogs.pro +++ b/examples/quickcontrols/dialogs/dialogs.pro diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/ColorDialogs.qml index 60db0d0f9..60db0d0f9 100644 --- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml +++ b/examples/quickcontrols/dialogs/systemdialogs/ColorDialogs.qml diff --git a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/CustomDialogs.qml index c99ed9deb..c99ed9deb 100644 --- a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml +++ b/examples/quickcontrols/dialogs/systemdialogs/CustomDialogs.qml diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/FileDialogs.qml index ad18cb577..ad18cb577 100644 --- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml +++ b/examples/quickcontrols/dialogs/systemdialogs/FileDialogs.qml diff --git a/examples/quick/dialogs/systemdialogs/FontDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/FontDialogs.qml index 91c20de24..91c20de24 100644 --- a/examples/quick/dialogs/systemdialogs/FontDialogs.qml +++ b/examples/quickcontrols/dialogs/systemdialogs/FontDialogs.qml diff --git a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/MessageDialogs.qml index b9b507c72..b9b507c72 100644 --- a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml +++ b/examples/quickcontrols/dialogs/systemdialogs/MessageDialogs.qml diff --git a/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg b/examples/quickcontrols/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg Binary files differindex 4517a3930..4517a3930 100644 --- a/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg +++ b/examples/quickcontrols/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg diff --git a/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc b/examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc index 1912a906c..1912a906c 100644 --- a/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc +++ b/examples/quickcontrols/dialogs/systemdialogs/doc/src/systemdialogs.qdoc diff --git a/examples/quick/dialogs/systemdialogs/main.cpp b/examples/quickcontrols/dialogs/systemdialogs/main.cpp index f16109d65..f16109d65 100644 --- a/examples/quick/dialogs/systemdialogs/main.cpp +++ b/examples/quickcontrols/dialogs/systemdialogs/main.cpp diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.pro b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.pro index 128bb1b5c..099e3773f 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.pro +++ b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.pro @@ -13,7 +13,7 @@ OTHER_FILES += \ MessageDialogs.qml \ CustomDialogs.qml -target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs/systemdialogs +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/dialogs/systemdialogs INSTALLS += target RESOURCES += systemdialogs.qrc diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qml b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qml index 5971e1c88..5971e1c88 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.qml +++ b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qml diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qrc index afd81bfee..afd81bfee 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc +++ b/examples/quickcontrols/dialogs/systemdialogs/systemdialogs.qrc diff --git a/examples/quick/extras/dashboard/dashboard.pro b/examples/quickcontrols/extras/dashboard/dashboard.pro index c549250ec..eb3ee51be 100644 --- a/examples/quick/extras/dashboard/dashboard.pro +++ b/examples/quickcontrols/extras/dashboard/dashboard.pro @@ -16,3 +16,6 @@ OTHER_FILES += \ qml/TachometerStyle.qml \ qml/TurnIndicator.qml \ qml/ValueSource.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/extras/dashboard +INSTALLS += target diff --git a/examples/quick/extras/dashboard/dashboard.qrc b/examples/quickcontrols/extras/dashboard/dashboard.qrc index 605e1678b..605e1678b 100644 --- a/examples/quick/extras/dashboard/dashboard.qrc +++ b/examples/quickcontrols/extras/dashboard/dashboard.qrc diff --git a/examples/quick/extras/dashboard/fonts/DejaVuSans.ttf b/examples/quickcontrols/extras/dashboard/fonts/DejaVuSans.ttf Binary files differindex 19ed0b468..19ed0b468 100644 --- a/examples/quick/extras/dashboard/fonts/DejaVuSans.ttf +++ b/examples/quickcontrols/extras/dashboard/fonts/DejaVuSans.ttf diff --git a/examples/quick/extras/dashboard/fonts/LICENSE b/examples/quickcontrols/extras/dashboard/fonts/LICENSE index 254e2cc42..254e2cc42 100644 --- a/examples/quick/extras/dashboard/fonts/LICENSE +++ b/examples/quickcontrols/extras/dashboard/fonts/LICENSE diff --git a/examples/quick/extras/dashboard/images/fuel-icon.png b/examples/quickcontrols/extras/dashboard/images/fuel-icon.png Binary files differindex 70da758c2..70da758c2 100644 --- a/examples/quick/extras/dashboard/images/fuel-icon.png +++ b/examples/quickcontrols/extras/dashboard/images/fuel-icon.png diff --git a/examples/quick/extras/dashboard/images/temperature-icon.png b/examples/quickcontrols/extras/dashboard/images/temperature-icon.png Binary files differindex 5a4334e01..5a4334e01 100644 --- a/examples/quick/extras/dashboard/images/temperature-icon.png +++ b/examples/quickcontrols/extras/dashboard/images/temperature-icon.png diff --git a/examples/quick/extras/dashboard/main.cpp b/examples/quickcontrols/extras/dashboard/main.cpp index 7a6f46e62..7a6f46e62 100644 --- a/examples/quick/extras/dashboard/main.cpp +++ b/examples/quickcontrols/extras/dashboard/main.cpp diff --git a/examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml b/examples/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml index feb85a5f3..feb85a5f3 100644 --- a/examples/quick/extras/dashboard/qml/DashboardGaugeStyle.qml +++ b/examples/quickcontrols/extras/dashboard/qml/DashboardGaugeStyle.qml diff --git a/examples/quick/extras/dashboard/qml/IconGaugeStyle.qml b/examples/quickcontrols/extras/dashboard/qml/IconGaugeStyle.qml index 392044869..392044869 100644 --- a/examples/quick/extras/dashboard/qml/IconGaugeStyle.qml +++ b/examples/quickcontrols/extras/dashboard/qml/IconGaugeStyle.qml diff --git a/examples/quick/extras/dashboard/qml/TachometerStyle.qml b/examples/quickcontrols/extras/dashboard/qml/TachometerStyle.qml index d92da7b5f..d92da7b5f 100644 --- a/examples/quick/extras/dashboard/qml/TachometerStyle.qml +++ b/examples/quickcontrols/extras/dashboard/qml/TachometerStyle.qml diff --git a/examples/quick/extras/dashboard/qml/TurnIndicator.qml b/examples/quickcontrols/extras/dashboard/qml/TurnIndicator.qml index b132510eb..b132510eb 100644 --- a/examples/quick/extras/dashboard/qml/TurnIndicator.qml +++ b/examples/quickcontrols/extras/dashboard/qml/TurnIndicator.qml diff --git a/examples/quick/extras/dashboard/qml/ValueSource.qml b/examples/quickcontrols/extras/dashboard/qml/ValueSource.qml index 7225be482..7225be482 100644 --- a/examples/quick/extras/dashboard/qml/ValueSource.qml +++ b/examples/quickcontrols/extras/dashboard/qml/ValueSource.qml diff --git a/examples/quick/extras/dashboard/qml/dashboard.qml b/examples/quickcontrols/extras/dashboard/qml/dashboard.qml index 6080b516d..6080b516d 100644 --- a/examples/quick/extras/dashboard/qml/dashboard.qml +++ b/examples/quickcontrols/extras/dashboard/qml/dashboard.qml diff --git a/examples/quick/extras/extras.pro b/examples/quickcontrols/extras/extras.pro index 7f7b72156..7f7b72156 100644 --- a/examples/quick/extras/extras.pro +++ b/examples/quickcontrols/extras/extras.pro diff --git a/examples/quick/extras/flat/Content.qml b/examples/quickcontrols/extras/flat/Content.qml index e9b3e869f..e9b3e869f 100644 --- a/examples/quick/extras/flat/Content.qml +++ b/examples/quickcontrols/extras/flat/Content.qml diff --git a/examples/quick/extras/flat/SettingsIcon.qml b/examples/quickcontrols/extras/flat/SettingsIcon.qml index 756426c49..756426c49 100644 --- a/examples/quick/extras/flat/SettingsIcon.qml +++ b/examples/quickcontrols/extras/flat/SettingsIcon.qml diff --git a/examples/quick/extras/flat/flat.pro b/examples/quickcontrols/extras/flat/flat.pro index 387e7ca09..6a6906648 100644 --- a/examples/quick/extras/flat/flat.pro +++ b/examples/quickcontrols/extras/flat/flat.pro @@ -14,3 +14,6 @@ OTHER_FILES += \ DISTFILES += \ Content.qml \ SettingsIcon.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/extras/flat +INSTALLS += target diff --git a/examples/quick/extras/flat/flat.qrc b/examples/quickcontrols/extras/flat/flat.qrc index 5b06a55ce..5b06a55ce 100644 --- a/examples/quick/extras/flat/flat.qrc +++ b/examples/quickcontrols/extras/flat/flat.qrc diff --git a/examples/quick/extras/flat/images/piemenu-bw-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png Binary files differindex ef57111fb..ef57111fb 100644 --- a/examples/quick/extras/flat/images/piemenu-bw-normal.png +++ b/examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png diff --git a/examples/quick/extras/flat/images/piemenu-bw-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png Binary files differindex b6bd1d20d..b6bd1d20d 100644 --- a/examples/quick/extras/flat/images/piemenu-bw-pressed.png +++ b/examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png diff --git a/examples/quick/extras/flat/images/piemenu-image-bw.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg Binary files differindex ce4d8ffda..ce4d8ffda 100644 --- a/examples/quick/extras/flat/images/piemenu-image-bw.jpg +++ b/examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg diff --git a/examples/quick/extras/flat/images/piemenu-image-rgb.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg Binary files differindex 2d7d22056..2d7d22056 100644 --- a/examples/quick/extras/flat/images/piemenu-image-rgb.jpg +++ b/examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg diff --git a/examples/quick/extras/flat/images/piemenu-image-sepia.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg Binary files differindex 3ef7b1f0f..3ef7b1f0f 100644 --- a/examples/quick/extras/flat/images/piemenu-image-sepia.jpg +++ b/examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg diff --git a/examples/quick/extras/flat/images/piemenu-rgb-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png Binary files differindex 2278f4a9e..2278f4a9e 100644 --- a/examples/quick/extras/flat/images/piemenu-rgb-normal.png +++ b/examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png diff --git a/examples/quick/extras/flat/images/piemenu-rgb-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png Binary files differindex f45846b17..f45846b17 100644 --- a/examples/quick/extras/flat/images/piemenu-rgb-pressed.png +++ b/examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png diff --git a/examples/quick/extras/flat/images/piemenu-sepia-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png Binary files differindex f1e9ffd26..f1e9ffd26 100644 --- a/examples/quick/extras/flat/images/piemenu-sepia-normal.png +++ b/examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png diff --git a/examples/quick/extras/flat/images/piemenu-sepia-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png Binary files differindex 0f2b35171..0f2b35171 100644 --- a/examples/quick/extras/flat/images/piemenu-sepia-pressed.png +++ b/examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png diff --git a/examples/quick/extras/flat/main.cpp b/examples/quickcontrols/extras/flat/main.cpp index dd90f807d..61b1e9b3e 100644 --- a/examples/quick/extras/flat/main.cpp +++ b/examples/quickcontrols/extras/flat/main.cpp @@ -57,7 +57,12 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); if (qgetenv("QT_QUICK_CONTROLS_1_STYLE").isEmpty()) { +#ifdef QT_STATIC + // Need a full path to find the style when built statically + qputenv("QT_QUICK_CONTROLS_1_STYLE", ":/ExtrasImports/QtQuick/Controls/Styles/Flat"); +#else qputenv("QT_QUICK_CONTROLS_1_STYLE", "Flat"); +#endif } QQmlApplicationEngine engine; engine.load(QUrl("qrc:/main.qml")); diff --git a/examples/quick/extras/flat/main.qml b/examples/quickcontrols/extras/flat/main.qml index d91c20633..d91c20633 100644 --- a/examples/quick/extras/flat/main.qml +++ b/examples/quickcontrols/extras/flat/main.qml diff --git a/examples/quick/extras/gallery/fonts/LICENSE.txt b/examples/quickcontrols/extras/gallery/fonts/LICENSE.txt index d64569567..d64569567 100644 --- a/examples/quick/extras/gallery/fonts/LICENSE.txt +++ b/examples/quickcontrols/extras/gallery/fonts/LICENSE.txt diff --git a/examples/quick/extras/gallery/fonts/OpenSans-Regular.ttf b/examples/quickcontrols/extras/gallery/fonts/OpenSans-Regular.ttf Binary files differindex db433349b..db433349b 100644 --- a/examples/quick/extras/gallery/fonts/OpenSans-Regular.ttf +++ b/examples/quickcontrols/extras/gallery/fonts/OpenSans-Regular.ttf diff --git a/examples/quick/extras/gallery/gallery.pro b/examples/quickcontrols/extras/gallery/gallery.pro index 3c50a7c23..548df63f4 100644 --- a/examples/quick/extras/gallery/gallery.pro +++ b/examples/quickcontrols/extras/gallery/gallery.pro @@ -9,6 +9,9 @@ SOURCES += \ RESOURCES += \ gallery.qrc +target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/extras/gallery +INSTALLS += target + OTHER_FILES += \ qml/BlackButtonBackground.qml \ qml/BlackButtonStyle.qml \ diff --git a/examples/quick/extras/gallery/gallery.qrc b/examples/quickcontrols/extras/gallery/gallery.qrc index 97beb6b1b..97beb6b1b 100644 --- a/examples/quick/extras/gallery/gallery.qrc +++ b/examples/quickcontrols/extras/gallery/gallery.qrc diff --git a/examples/quick/extras/gallery/images/background-light.png b/examples/quickcontrols/extras/gallery/images/background-light.png Binary files differindex 2f7698452..2f7698452 100644 --- a/examples/quick/extras/gallery/images/background-light.png +++ b/examples/quickcontrols/extras/gallery/images/background-light.png diff --git a/examples/quick/extras/gallery/images/background.png b/examples/quickcontrols/extras/gallery/images/background.png Binary files differindex a3f4302bc..a3f4302bc 100644 --- a/examples/quick/extras/gallery/images/background.png +++ b/examples/quickcontrols/extras/gallery/images/background.png diff --git a/examples/quick/extras/gallery/images/center-light.png b/examples/quickcontrols/extras/gallery/images/center-light.png Binary files differindex 75add20ce..75add20ce 100644 --- a/examples/quick/extras/gallery/images/center-light.png +++ b/examples/quickcontrols/extras/gallery/images/center-light.png diff --git a/examples/quick/extras/gallery/images/center.png b/examples/quickcontrols/extras/gallery/images/center.png Binary files differindex fd3696404..fd3696404 100644 --- a/examples/quick/extras/gallery/images/center.png +++ b/examples/quickcontrols/extras/gallery/images/center.png diff --git a/examples/quick/extras/gallery/images/icon-back.png b/examples/quickcontrols/extras/gallery/images/icon-back.png Binary files differindex 0b037ff69..0b037ff69 100644 --- a/examples/quick/extras/gallery/images/icon-back.png +++ b/examples/quickcontrols/extras/gallery/images/icon-back.png diff --git a/examples/quick/extras/gallery/images/icon-go.png b/examples/quickcontrols/extras/gallery/images/icon-go.png Binary files differindex bcb2a822a..bcb2a822a 100644 --- a/examples/quick/extras/gallery/images/icon-go.png +++ b/examples/quickcontrols/extras/gallery/images/icon-go.png diff --git a/examples/quick/extras/gallery/images/icon-settings.png b/examples/quickcontrols/extras/gallery/images/icon-settings.png Binary files differindex 7763ba20e..7763ba20e 100644 --- a/examples/quick/extras/gallery/images/icon-settings.png +++ b/examples/quickcontrols/extras/gallery/images/icon-settings.png diff --git a/examples/quick/extras/gallery/images/info.png b/examples/quickcontrols/extras/gallery/images/info.png Binary files differindex 5c7a9df3c..5c7a9df3c 100644 --- a/examples/quick/extras/gallery/images/info.png +++ b/examples/quickcontrols/extras/gallery/images/info.png diff --git a/examples/quick/extras/gallery/images/needle-light.png b/examples/quickcontrols/extras/gallery/images/needle-light.png Binary files differindex d486d9e53..d486d9e53 100644 --- a/examples/quick/extras/gallery/images/needle-light.png +++ b/examples/quickcontrols/extras/gallery/images/needle-light.png diff --git a/examples/quick/extras/gallery/images/needle.png b/examples/quickcontrols/extras/gallery/images/needle.png Binary files differindex 6b10c604a..6b10c604a 100644 --- a/examples/quick/extras/gallery/images/needle.png +++ b/examples/quickcontrols/extras/gallery/images/needle.png diff --git a/examples/quick/extras/gallery/images/qt-logo.png b/examples/quickcontrols/extras/gallery/images/qt-logo.png Binary files differindex 14ddf2a02..14ddf2a02 100644 --- a/examples/quick/extras/gallery/images/qt-logo.png +++ b/examples/quickcontrols/extras/gallery/images/qt-logo.png diff --git a/examples/quick/extras/gallery/images/zoom_in.png b/examples/quickcontrols/extras/gallery/images/zoom_in.png Binary files differindex 412821064..412821064 100644 --- a/examples/quick/extras/gallery/images/zoom_in.png +++ b/examples/quickcontrols/extras/gallery/images/zoom_in.png diff --git a/examples/quick/extras/gallery/images/zoom_out.png b/examples/quickcontrols/extras/gallery/images/zoom_out.png Binary files differindex 772d6ac17..772d6ac17 100644 --- a/examples/quick/extras/gallery/images/zoom_out.png +++ b/examples/quickcontrols/extras/gallery/images/zoom_out.png diff --git a/examples/quick/extras/gallery/main.cpp b/examples/quickcontrols/extras/gallery/main.cpp index 01e510e8d..01e510e8d 100644 --- a/examples/quick/extras/gallery/main.cpp +++ b/examples/quickcontrols/extras/gallery/main.cpp diff --git a/examples/quick/extras/gallery/qml/BlackButtonBackground.qml b/examples/quickcontrols/extras/gallery/qml/BlackButtonBackground.qml index 10f3d7045..10f3d7045 100644 --- a/examples/quick/extras/gallery/qml/BlackButtonBackground.qml +++ b/examples/quickcontrols/extras/gallery/qml/BlackButtonBackground.qml diff --git a/examples/quick/extras/gallery/qml/BlackButtonStyle.qml b/examples/quickcontrols/extras/gallery/qml/BlackButtonStyle.qml index c151d6d64..c151d6d64 100644 --- a/examples/quick/extras/gallery/qml/BlackButtonStyle.qml +++ b/examples/quickcontrols/extras/gallery/qml/BlackButtonStyle.qml diff --git a/examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml b/examples/quickcontrols/extras/gallery/qml/CircularGaugeDarkStyle.qml index a38eba1fd..a38eba1fd 100644 --- a/examples/quick/extras/gallery/qml/CircularGaugeDarkStyle.qml +++ b/examples/quickcontrols/extras/gallery/qml/CircularGaugeDarkStyle.qml diff --git a/examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml b/examples/quickcontrols/extras/gallery/qml/CircularGaugeDefaultStyle.qml index 82e568ea9..82e568ea9 100644 --- a/examples/quick/extras/gallery/qml/CircularGaugeDefaultStyle.qml +++ b/examples/quickcontrols/extras/gallery/qml/CircularGaugeDefaultStyle.qml diff --git a/examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml b/examples/quickcontrols/extras/gallery/qml/CircularGaugeLightStyle.qml index 03f63c4a1..03f63c4a1 100644 --- a/examples/quick/extras/gallery/qml/CircularGaugeLightStyle.qml +++ b/examples/quickcontrols/extras/gallery/qml/CircularGaugeLightStyle.qml diff --git a/examples/quick/extras/gallery/qml/CircularGaugeView.qml b/examples/quickcontrols/extras/gallery/qml/CircularGaugeView.qml index bfb7a0c75..bfb7a0c75 100644 --- a/examples/quick/extras/gallery/qml/CircularGaugeView.qml +++ b/examples/quickcontrols/extras/gallery/qml/CircularGaugeView.qml diff --git a/examples/quick/extras/gallery/qml/ControlLabel.qml b/examples/quickcontrols/extras/gallery/qml/ControlLabel.qml index a176eaa6a..a176eaa6a 100644 --- a/examples/quick/extras/gallery/qml/ControlLabel.qml +++ b/examples/quickcontrols/extras/gallery/qml/ControlLabel.qml diff --git a/examples/quick/extras/gallery/qml/ControlView.qml b/examples/quickcontrols/extras/gallery/qml/ControlView.qml index 2f99ea77d..2f99ea77d 100644 --- a/examples/quick/extras/gallery/qml/ControlView.qml +++ b/examples/quickcontrols/extras/gallery/qml/ControlView.qml diff --git a/examples/quick/extras/gallery/qml/ControlViewToolbar.qml b/examples/quickcontrols/extras/gallery/qml/ControlViewToolbar.qml index f7a991fcc..f7a991fcc 100644 --- a/examples/quick/extras/gallery/qml/ControlViewToolbar.qml +++ b/examples/quickcontrols/extras/gallery/qml/ControlViewToolbar.qml diff --git a/examples/quick/extras/gallery/qml/CustomizerLabel.qml b/examples/quickcontrols/extras/gallery/qml/CustomizerLabel.qml index 3216bd63b..3216bd63b 100644 --- a/examples/quick/extras/gallery/qml/CustomizerLabel.qml +++ b/examples/quickcontrols/extras/gallery/qml/CustomizerLabel.qml diff --git a/examples/quick/extras/gallery/qml/CustomizerSlider.qml b/examples/quickcontrols/extras/gallery/qml/CustomizerSlider.qml index d4972ad1c..d4972ad1c 100644 --- a/examples/quick/extras/gallery/qml/CustomizerSlider.qml +++ b/examples/quickcontrols/extras/gallery/qml/CustomizerSlider.qml diff --git a/examples/quick/extras/gallery/qml/CustomizerSwitch.qml b/examples/quickcontrols/extras/gallery/qml/CustomizerSwitch.qml index c8feace1f..c8feace1f 100644 --- a/examples/quick/extras/gallery/qml/CustomizerSwitch.qml +++ b/examples/quickcontrols/extras/gallery/qml/CustomizerSwitch.qml diff --git a/examples/quick/extras/gallery/qml/FlickableMoreIndicator.qml b/examples/quickcontrols/extras/gallery/qml/FlickableMoreIndicator.qml index 674f3b586..674f3b586 100644 --- a/examples/quick/extras/gallery/qml/FlickableMoreIndicator.qml +++ b/examples/quickcontrols/extras/gallery/qml/FlickableMoreIndicator.qml diff --git a/examples/quick/extras/gallery/qml/PieMenuControlView.qml b/examples/quickcontrols/extras/gallery/qml/PieMenuControlView.qml index 1c4030da3..1c4030da3 100644 --- a/examples/quick/extras/gallery/qml/PieMenuControlView.qml +++ b/examples/quickcontrols/extras/gallery/qml/PieMenuControlView.qml diff --git a/examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml b/examples/quickcontrols/extras/gallery/qml/PieMenuDarkStyle.qml index fc5134630..fc5134630 100644 --- a/examples/quick/extras/gallery/qml/PieMenuDarkStyle.qml +++ b/examples/quickcontrols/extras/gallery/qml/PieMenuDarkStyle.qml diff --git a/examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml b/examples/quickcontrols/extras/gallery/qml/PieMenuDefaultStyle.qml index c6bf8f715..c6bf8f715 100644 --- a/examples/quick/extras/gallery/qml/PieMenuDefaultStyle.qml +++ b/examples/quickcontrols/extras/gallery/qml/PieMenuDefaultStyle.qml diff --git a/examples/quick/extras/gallery/qml/StylePicker.qml b/examples/quickcontrols/extras/gallery/qml/StylePicker.qml index 5a84d3620..5a84d3620 100644 --- a/examples/quick/extras/gallery/qml/StylePicker.qml +++ b/examples/quickcontrols/extras/gallery/qml/StylePicker.qml diff --git a/examples/quick/extras/gallery/qml/gallery.qml b/examples/quickcontrols/extras/gallery/qml/gallery.qml index ae6c162d1..ae6c162d1 100644 --- a/examples/quick/extras/gallery/qml/gallery.qml +++ b/examples/quickcontrols/extras/gallery/qml/gallery.qml diff --git a/examples/quickcontrols/quickcontrols.pro b/examples/quickcontrols/quickcontrols.pro new file mode 100644 index 000000000..dfe855099 --- /dev/null +++ b/examples/quickcontrols/quickcontrols.pro @@ -0,0 +1,5 @@ +TEMPLATE = subdirs +SUBDIRS = \ + controls \ + dialogs \ + extras diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index 450f91b6e..dfab577ed 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -93,16 +93,11 @@ static bool fromResource(const QString &path) bool QQuickControlSettings1::hasTouchScreen() const { -// QTBUG-36007 -#if defined(Q_OS_ANDROID) - return true; -#else const auto devices = QTouchDevice::devices(); for (const QTouchDevice *dev : devices) if (dev->type() == QTouchDevice::TouchScreen) return true; return false; -#endif } bool QQuickControlSettings1::isMobile() const diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index 79fba8beb..527fefced 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -283,7 +283,6 @@ QQuickStyleItem1::~QQuickStyleItem1() void QQuickStyleItem1::initStyleOption() { - QString type = elementType(); if (m_styleoption) m_styleoption->state = 0; diff --git a/src/controls/Styles/Android/plugin.cpp b/src/controls/Styles/Android/plugin.cpp index 5656b83d7..646fff362 100644 --- a/src/controls/Styles/Android/plugin.cpp +++ b/src/controls/Styles/Android/plugin.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QtQuickControls1AndroidStylePlugin: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtQuickControls1AndroidStylePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } diff --git a/src/controls/Styles/Base/DialStyle.qml b/src/controls/Styles/Base/DialStyle.qml index 684099389..95172455e 100644 --- a/src/controls/Styles/Base/DialStyle.qml +++ b/src/controls/Styles/Base/DialStyle.qml @@ -154,10 +154,6 @@ Style { the style's components. For example, it can be used to calculate the angles at which to draw an arc around the dial indicating the safe range of values. - - For example, if minimumValueAngle is set to \c 270 and - maximumValueAngle is set to \c 90, this function will return \c 270 - when passed minimumValue and \c 90 when passed maximumValue. */ function valueToAngle(value) { return control.__panel.circularTickmarkLabel.valueToAngle(value); diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf index 6ea7e7412..801cfb759 100644 --- a/src/controls/doc/qtquickcontrols.qdocconf +++ b/src/controls/doc/qtquickcontrols.qdocconf @@ -39,9 +39,9 @@ depends = qtcore qtdoc qtgui qtwidgets qtqml qtquick qtquicklayouts qtquickdialo # Specify the install path under QT_INSTALL_EXAMPLES # Examples will be installed under quick/controls - 'controls' subdirectory # is given as part of \example commands -exampledirs += ../../../examples/quick/controls \ +exampledirs += ../../../examples/quickcontrols/controls \ snippets -examplesinstallpath = qtquickcontrols/quick/controls +examplesinstallpath = qtquickcontrols/quickcontrols/controls headerdirs += .. @@ -56,7 +56,7 @@ sources += ../Private/AbstractCheckable.qml \ ../Private/Control.qml \ ../Private/qquickstyleitem.cpp \ ../Private/Style.qml \ - ../Private/qquickabstractstyle.h \ + ../Private/qquickabstractstyle_p.h \ ../Private/qquickabstractstyle.cpp excludefiles += ../TableView.qml \ diff --git a/src/controls/plugin.h b/src/controls/plugin.h index 089d752fa..04fd0685a 100644 --- a/src/controls/plugin.h +++ b/src/controls/plugin.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QtQuickControls1Plugin: public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtQuickControls1Plugin(QObject *parent = 0); void registerTypes(const char *uri); diff --git a/src/controls/qmldir b/src/controls/qmldir index 9f35da295..75f5e24c8 100644 --- a/src/controls/qmldir +++ b/src/controls/qmldir @@ -4,3 +4,4 @@ classname QtQuickControls1Plugin typeinfo plugins.qmltypes designersupported depends QtQuick.Window 2.2 +depends QtQuick.Layouts 1.0 diff --git a/src/dialogs/DefaultDialogWrapper.qml b/src/dialogs/DefaultDialogWrapper.qml index 6c2cae06e..b446c3162 100644 --- a/src/dialogs/DefaultDialogWrapper.qml +++ b/src/dialogs/DefaultDialogWrapper.qml @@ -53,13 +53,14 @@ AbstractDialog { id: content property real spacing: 6 property real outerSpacing: 12 - property real buttonsRowImplicitWidth: minimumWidth + property real buttonsRowImplicitHeight: 0 + property real buttonsRowImplicitWidth: Screen.pixelDensity * 50 property bool buttonsInSingleRow: defaultContentItem.width >= buttonsRowImplicitWidth property real minimumHeight: implicitHeight - property real minimumWidth: Screen.pixelDensity * 50 - implicitHeight: defaultContentItem.implicitHeight + spacing + outerSpacing * 2 + buttonsRight.implicitHeight + property real minimumWidth: implicitWidth + implicitHeight: defaultContentItem.implicitHeight + spacing + outerSpacing * 2 + Math.max(buttonsRight.implicitHeight, buttonsRowImplicitHeight) implicitWidth: Math.min(root.__maximumDimension, Math.max( - defaultContentItem.implicitWidth, buttonsRowImplicitWidth, Screen.pixelDensity * 50) + outerSpacing * 2); + defaultContentItem.implicitWidth, buttonsRowImplicitWidth, Screen.pixelDensity * 50) + outerSpacing * 2) color: palette.window Keys.onPressed: { event.accepted = true @@ -85,9 +86,14 @@ AbstractDialog { left: parent.left right: parent.right top: parent.top + bottom: buttonsLeft.implicitHeight ? buttonsLeft.top : buttonsRight.top margins: content.outerSpacing + bottomMargin: buttonsLeft.implicitHeight + buttonsRight.implicitHeight > 0 ? content.spacing : 0 } - implicitHeight: childrenRect.height + implicitHeight: children.length === 1 ? children[0].implicitHeight + : (children.length ? childrenRect.height : 0) + implicitWidth: children.length === 1 ? children[0].implicitWidth + : (children.length ? childrenRect.width : 0) } Flow { @@ -138,7 +144,9 @@ AbstractDialog { function setupButtons() { buttonsLeftRepeater.model = root.__standardButtonsLeftModel() buttonsRightRepeater.model = root.__standardButtonsRightModel() - if (buttonsLeftRepeater.count + buttonsRightRepeater.count < 2) + if (buttonsRightRepeater.model && buttonsRightRepeater.model.length > 0) + content.buttonsRowImplicitHeight = buttonsRight.visibleChildren[0].implicitHeight + if (buttonsLeftRepeater.count + buttonsRightRepeater.count < 1) return; var calcWidth = 0; @@ -153,7 +161,7 @@ AbstractDialog { for (var i = 0; i < buttonsRight.visibleChildren.length; ++i) calculateForButton(i, buttonsRight.visibleChildren[i]) - content.minimumWidth = calcWidth + content.outerSpacing * 2 + content.minimumWidth = Math.max(calcWidth + content.outerSpacing * 2, content.implicitWidth) for (i = 0; i < buttonsLeft.visibleChildren.length; ++i) calculateForButton(i, buttonsLeft.visibleChildren[i]) content.buttonsRowImplicitWidth = calcWidth + content.spacing diff --git a/src/dialogs/Private/dialogsprivateplugin.cpp b/src/dialogs/Private/dialogsprivateplugin.cpp index e9b39e05d..ba8aabe33 100644 --- a/src/dialogs/Private/dialogsprivateplugin.cpp +++ b/src/dialogs/Private/dialogsprivateplugin.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QtQuick2DialogsPrivatePlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtQuick2DialogsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } diff --git a/src/dialogs/doc/qtquickdialogs.qdocconf b/src/dialogs/doc/qtquickdialogs.qdocconf index 30f3635a3..d4c55b848 100644 --- a/src/dialogs/doc/qtquickdialogs.qdocconf +++ b/src/dialogs/doc/qtquickdialogs.qdocconf @@ -24,9 +24,9 @@ qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.sortPages = true depends = qtqml qtquick qtgui qtwidgets qtdoc qtcore -exampledirs += ../../../examples/quick/dialogs +exampledirs += ../../../examples/quickcontrols/dialogs -examplesinstallpath = qtquickcontrols/quick/dialogs +examplesinstallpath = qtquickcontrols/quickcontrols/dialogs headerdirs += .. diff --git a/src/dialogs/doc/src/qtquickdialogs-index.qdoc b/src/dialogs/doc/src/qtquickdialogs-index.qdoc index a094a27a2..0adf28af6 100644 --- a/src/dialogs/doc/src/qtquickdialogs-index.qdoc +++ b/src/dialogs/doc/src/qtquickdialogs-index.qdoc @@ -26,12 +26,6 @@ ****************************************************************************/ /*! - \group dialogs - \brief Dialog components - \title Dialogs -*/ - -/*! \page qtquickdialogs-index.html \title Qt Quick Dialogs @@ -41,7 +35,7 @@ \section1 Dialogs - \annotatedlist dialogs + \annotatedlist qtquickdialogs \section1 Related information diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 1ab6b581b..23eeac388 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE class QtQuick2DialogsPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { initResources(); } diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp index afc27b771..652376528 100644 --- a/src/dialogs/qquickabstractdialog.cpp +++ b/src/dialogs/qquickabstractdialog.cpp @@ -138,7 +138,7 @@ void QQuickAbstractDialog::setVisible(bool v) m_dialogWindow->setMinimumSize(minSize); connect(win, SIGNAL(widthChanged(int)), this, SLOT(windowGeometryChanged())); connect(win, SIGNAL(heightChanged(int)), this, SLOT(windowGeometryChanged())); - qCDebug(lcWindow) << "created window" << win; + qCDebug(lcWindow) << "created window" << win << "with min size" << win->minimumSize() << "geometry" << win->geometry(); } if (!m_dialogWindow) { @@ -282,16 +282,21 @@ void QQuickAbstractDialog::windowGeometryChanged() void QQuickAbstractDialog::minimumWidthChanged() { qreal min = m_contentItem->property("minimumWidth").toReal(); + qreal implicitOrMin = qMax(m_contentItem->implicitWidth(), min); qCDebug(lcWindow) << "content implicitWidth" << m_contentItem->implicitWidth() << "minimumWidth" << min; - m_dialogWindow->setMinimumWidth(qMax(m_contentItem->implicitWidth(), min)); + if (m_dialogWindow->width() < implicitOrMin) + m_dialogWindow->setWidth(implicitOrMin); + m_dialogWindow->setMinimumWidth(implicitOrMin); } void QQuickAbstractDialog::minimumHeightChanged() { qreal min = m_contentItem->property("minimumHeight").toReal(); + qreal implicitOrMin = qMax(m_contentItem->implicitHeight(), min); qCDebug(lcWindow) << "content implicitHeight" << m_contentItem->implicitHeight() << "minimumHeight" << min; - m_dialogWindow->setMinimumHeight(qMax(m_contentItem->implicitHeight(), - m_contentItem->property("minimumHeight").toReal())); + if (m_dialogWindow->height() < implicitOrMin) + m_dialogWindow->setHeight(implicitOrMin); + m_dialogWindow->setMinimumHeight(implicitOrMin); } void QQuickAbstractDialog::implicitHeightChanged() diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index c6f50df00..33e3b02b9 100644 --- a/src/dialogs/qquickdialog.cpp +++ b/src/dialogs/qquickdialog.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \qmltype Dialog \instantiates QQuickDialog \inqmlmodule QtQuick.Dialogs - \ingroup dialogs + \ingroup qtquickdialogs \brief A generic QtQuick dialog wrapper with standard buttons. \since 5.3 diff --git a/src/dialogs/qquickplatformcolordialog.cpp b/src/dialogs/qquickplatformcolordialog.cpp index d10c444ed..c002f322d 100644 --- a/src/dialogs/qquickplatformcolordialog.cpp +++ b/src/dialogs/qquickplatformcolordialog.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \qmltype ColorDialog \instantiates QQuickPlatformColorDialog \inqmlmodule QtQuick.Dialogs - \ingroup dialogs + \ingroup qtquickdialogs \brief Dialog component for choosing a color. \since 5.1 diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp index fe51cc48c..d70c44d9c 100644 --- a/src/dialogs/qquickplatformfiledialog.cpp +++ b/src/dialogs/qquickplatformfiledialog.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \qmltype FileDialog \instantiates QQuickPlatformFileDialog \inqmlmodule QtQuick.Dialogs - \ingroup dialogs + \ingroup qtquickdialogs \brief Dialog component for choosing files from a local filesystem. \since 5.1 diff --git a/src/dialogs/qquickplatformfontdialog.cpp b/src/dialogs/qquickplatformfontdialog.cpp index eb29fd0b6..247e869e2 100644 --- a/src/dialogs/qquickplatformfontdialog.cpp +++ b/src/dialogs/qquickplatformfontdialog.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \instantiates QQuickPlatformFontDialog \inqmlmodule QtQuick.Dialogs \ingroup qtquick-visual - \ingroup dialogs + \ingroup qtquickdialogs \brief Dialog component for choosing a font. \since 5.2 diff --git a/src/dialogs/qquickplatformmessagedialog.cpp b/src/dialogs/qquickplatformmessagedialog.cpp index fcf30b2d2..2e3afa481 100644 --- a/src/dialogs/qquickplatformmessagedialog.cpp +++ b/src/dialogs/qquickplatformmessagedialog.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \qmltype MessageDialog \instantiates QQuickPlatformMessageDialog \inqmlmodule QtQuick.Dialogs - \ingroup dialogs + \ingroup qtquickdialogs \brief Dialog component for displaying popup messages. \since 5.2 diff --git a/src/extras/Private/qquickmousethief_p.h b/src/extras/Private/qquickmousethief_p.h index 80f0d0ea9..6f289ff64 100644 --- a/src/extras/Private/qquickmousethief_p.h +++ b/src/extras/Private/qquickmousethief_p.h @@ -41,6 +41,7 @@ #define MOUSETHIEF_H #include <QObject> +#include <QPointer> #include <QtQuick/QQuickItem> class QQuickMouseThief : public QObject @@ -81,7 +82,7 @@ private: void emitReleased(const QPointF &pos); void emitClicked(const QPointF &pos); - QQuickItem *mItem; + QPointer<QQuickItem> mItem; bool mReceivedPressEvent; bool mAcceptCurrentEvent; }; diff --git a/src/extras/Styles/Flat/flatstyleplugin.h b/src/extras/Styles/Flat/flatstyleplugin.h index 0e372439f..80261e14e 100644 --- a/src/extras/Styles/Flat/flatstyleplugin.h +++ b/src/extras/Styles/Flat/flatstyleplugin.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QtQuickExtrasStylesPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: explicit QtQuickExtrasStylesPlugin(QObject *parent = 0); diff --git a/src/extras/doc/qtquickextras.qdocconf b/src/extras/doc/qtquickextras.qdocconf index 747465fc0..f854b89e9 100644 --- a/src/extras/doc/qtquickextras.qdocconf +++ b/src/extras/doc/qtquickextras.qdocconf @@ -29,8 +29,8 @@ qhp.QtQuickExtras.subprojects.qtquickextrasexamples.sortPages = true depends = qtqml qtquick qtdoc qtquickcontrols qtgui -exampledirs += ../../../examples/quick/extras -examplesinstallpath = qtquickcontrols/quick/extras +exampledirs += ../../../examples/quickcontrols/extras +examplesinstallpath = qtquickcontrols/quickcontrols/extras headerdirs += ../ diff --git a/src/extras/plugin.h b/src/extras/plugin.h index 9f9e15d8b..05855f493 100644 --- a/src/extras/plugin.h +++ b/src/extras/plugin.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QtQuickExtrasPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: explicit QtQuickExtrasPlugin(QObject *parent = 0); diff --git a/src/widgets/widgetsplugin.cpp b/src/widgets/widgetsplugin.cpp index cb4fe8f89..9ed0e6bc5 100644 --- a/src/widgets/widgetsplugin.cpp +++ b/src/widgets/widgetsplugin.cpp @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE class QtQuick2PrivateWidgetsPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtQuick2PrivateWidgetsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } diff --git a/tests/auto/controls/data/tst_treeview.qml b/tests/auto/controls/data/tst_treeview.qml index c6d4935b9..dad10a6b8 100644 --- a/tests/auto/controls/data/tst_treeview.qml +++ b/tests/auto/controls/data/tst_treeview.qml @@ -761,6 +761,7 @@ Item { } function test_indexAt() { + skip("Fails because of bug QTBUG-47523") if (Settings.hasTouchScreen) skip("Fails with touch screens"); var component = Qt.createComponent("treeview/treeview_1.qml") diff --git a/tests/auto/dialogs/data/DialogImplicitSize.qml b/tests/auto/dialogs/data/DialogImplicitSize.qml new file mode 100644 index 000000000..8239c4514 --- /dev/null +++ b/tests/auto/dialogs/data/DialogImplicitSize.qml @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Dialogs 1.2 + +Dialog { + visible: true + title: "Blue sky dialog" + standardButtons: buttonsFromTest + + Rectangle { + color: "lightskyblue" + implicitWidth: 400 + implicitHeight: 150 + Text { + text: "Hello blue sky!" + color: "navy" + anchors.centerIn: parent + } + } +} diff --git a/tests/auto/dialogs/data/DialogMinimumSize.qml b/tests/auto/dialogs/data/DialogMinimumSize.qml new file mode 100644 index 000000000..7f5baa633 --- /dev/null +++ b/tests/auto/dialogs/data/DialogMinimumSize.qml @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Dialogs 1.2 + +Dialog { + visible: true + title: "Blue sky dialog" + width: 400 + height: 300 + + Rectangle { + objectName: "userContent" + anchors.fill: parent + implicitWidth: 10 + implicitHeight: 10 + color: "lightskyblue" + Text { + text: "Hello blue sky!" + color: "navy" + anchors.centerIn: parent + } + } +} diff --git a/tests/auto/dialogs/dialogs.pro b/tests/auto/dialogs/dialogs.pro index d8e15dead..bb47b496d 100644 --- a/tests/auto/dialogs/dialogs.pro +++ b/tests/auto/dialogs/dialogs.pro @@ -2,6 +2,8 @@ CONFIG += testcase TARGET = tst_dialogs SOURCES += tst_dialogs.cpp +INCLUDEPATH += $$PWD/../../../src/dialogs + include (../shared/util.pri) osx:CONFIG -= app_bundle diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp index afe4ca0d6..1f1399661 100644 --- a/tests/auto/dialogs/tst_dialogs.cpp +++ b/tests/auto/dialogs/tst_dialogs.cpp @@ -28,6 +28,10 @@ #include <qtest.h> #include "../shared/util.h" +#include "qquickabstractdialog_p.h" +#include <QtQml/QQmlComponent> +#include <QtQml/QQmlContext> +#include <QtQml/QQmlEngine> #include <QtQuick/QQuickItem> #include <QtQuick/QQuickView> #include <QSignalSpy> @@ -43,6 +47,11 @@ private slots: QQmlDataTest::initTestCase(); } + //Dialog + void dialogImplicitWidth_data(); + void dialogImplicitWidth(); + void dialogContentResize(); + // FileDialog void fileDialogDefaultModality(); void fileDialogNonModal(); @@ -51,6 +60,58 @@ private slots: private: }; +void tst_dialogs::dialogImplicitWidth_data() +{ + QTest::addColumn<int>("standardButtons"); + QTest::addColumn<int>("minimumHeight"); + + QTest::newRow("No buttons") << + int(QQuickAbstractDialog::NoButton) << + 150; + QTest::newRow("OK button") << + int(QQuickAbstractDialog::Ok) << + 160; +} + +void tst_dialogs::dialogImplicitWidth() +{ + QFETCH(int, standardButtons); + QFETCH(int, minimumHeight); + + /* This is the outerSpacing from DefaultDialogWrapper.qml, + * which is always present */ + int heightMargins = 12 * 2; + QQmlEngine engine; + engine.rootContext()->setContextProperty("buttonsFromTest", standardButtons); + QQmlComponent component(&engine); + component.loadUrl(testFileUrl("DialogImplicitSize.qml")); + QObject *created = component.create(); + QScopedPointer<QObject> cleanup(created); + QVERIFY(created); + + QTRY_VERIFY(created->property("width").toInt() >= 400); + QTRY_VERIFY(created->property("height").toInt() >= minimumHeight + heightMargins); +} + +void tst_dialogs::dialogContentResize() +{ + QQmlEngine engine; + QQmlComponent component(&engine); + component.loadUrl(testFileUrl("DialogMinimumSize.qml")); + QObject *created = component.create(); + QScopedPointer<QObject> cleanup(created); + QVERIFY(created); + + QTRY_COMPARE(created->property("width").toInt(), 400); + QTRY_COMPARE(created->property("height").toInt(), 300); + + // Check that the content item has been sized up from its implicit size + QQuickItem *userContent = created->findChild<QQuickItem*>("userContent"); + QVERIFY(userContent); + QVERIFY(userContent->width() > 350); + QVERIFY(userContent->height() > 200); +} + void tst_dialogs::fileDialogDefaultModality() { QQuickView *window = new QQuickView; diff --git a/tests/auto/extras/data/tst_circulartickmarklabel.qml b/tests/auto/extras/data/tst_circulartickmarklabel.qml index ecf4f6611..deddc9b7b 100644 --- a/tests/auto/extras/data/tst_circulartickmarklabel.qml +++ b/tests/auto/extras/data/tst_circulartickmarklabel.qml @@ -55,7 +55,7 @@ import "TestUtils.js" as TestUtils TestCase { id: testcase name: "Tests_CircularTickmarkLabel" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/extras/data/tst_common.qml b/tests/auto/extras/data/tst_common.qml index 3a2d3fc1d..dc554735e 100644 --- a/tests/auto/extras/data/tst_common.qml +++ b/tests/auto/extras/data/tst_common.qml @@ -54,7 +54,7 @@ import QtQuick 2.1 TestCase { id: testCase name: "Tests_Common" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 @@ -67,23 +67,29 @@ TestCase { { tag: "DelayButton" }, { tag: "Dial" }, { tag: "Gauge" }, - { tag: "PieMenu", qml: "import QtQuick.Controls 1.1; import QtQuick.Extras 1.4;" - + "PieMenu { visible: true; MenuItem { text: 'foo' } }"}, { tag: "StatusIndicator" }, { tag: "ToggleButton" }, - { tag: "Tumbler", qml: "import QtQuick.Extras 1.4; Tumbler { TumblerColumn { model: 10 } }" } + { tag: "Tumbler", qml: "import QtQuick.Extras 1.4; Tumbler { TumblerColumn { model: 10 } }" }, + { tag: "PieMenu", qml: "import QtQuick.Controls 1.1; import QtQuick.Extras 1.4;" + + "PieMenu { visible: true; MenuItem { text: 'foo' } }"} ]; } + function init() { + if (Qt.platform.os === "windows") + skip("QTBUG-53123"); + } + function cleanup() { - control.destroy(); + if (control) + control.destroy(); } function test_resize(data) { var qml = data.qml ? data.qml : "import QtQuick.Extras 1.4; " + data.tag + " { }"; control = Qt.createQmlObject(qml, testCase, ""); - var resizeAnimation = Qt.createQmlObject("import QtQuick 2.2; NumberAnimation {}", testCase, ""); + var resizeAnimation = Qt.createQmlObject("import QtQuick 2.2; NumberAnimation {}", control, ""); resizeAnimation.target = control; resizeAnimation.properties = "width,height"; resizeAnimation.duration = 100; @@ -91,6 +97,5 @@ TestCase { resizeAnimation.start(); // Shouldn't get any warnings. tryCompare(resizeAnimation, "running", false); - resizeAnimation.destroy(); } } diff --git a/tests/auto/extras/data/tst_delaybutton.qml b/tests/auto/extras/data/tst_delaybutton.qml index fc7d90ff2..5475037ea 100644 --- a/tests/auto/extras/data/tst_delaybutton.qml +++ b/tests/auto/extras/data/tst_delaybutton.qml @@ -54,7 +54,7 @@ import QtQuick 2.1 TestCase { id: testcase name: "Tests_DelayButton" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/extras/data/tst_dial.qml b/tests/auto/extras/data/tst_dial.qml index f9c23dada..a519eb5bf 100644 --- a/tests/auto/extras/data/tst_dial.qml +++ b/tests/auto/extras/data/tst_dial.qml @@ -55,7 +55,7 @@ import "TestUtils.js" as TestUtils TestCase { id: testcase name: "Tests_Dial" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 @@ -378,4 +378,14 @@ TestCase { dial.destroy(); } + + function test_valueToAngle() { + var dial = Qt.createQmlObject("import QtQuick.Extras 1.4; Dial { }", testcase, ""); + verify(dial, "Dial: failed to create an instance"); + + compare(dial.__style.valueToAngle(0.0), dial.__panel.circularTickmarkLabel.minimumValueAngle); + compare(dial.__style.valueToAngle(1.0), dial.__panel.circularTickmarkLabel.maximumValueAngle); + + dial.destroy(); + } } diff --git a/tests/auto/extras/data/tst_gauge.qml b/tests/auto/extras/data/tst_gauge.qml index 7258dcd6c..6fdd6be65 100644 --- a/tests/auto/extras/data/tst_gauge.qml +++ b/tests/auto/extras/data/tst_gauge.qml @@ -56,9 +56,9 @@ import "TestUtils.js" as TestUtils TestCase { id: testcase name: "Tests_Gauge" - visible: windowShown + visible: true when: windowShown - width: 60 + width: 200 height: 200 property var gauge diff --git a/tests/auto/extras/data/tst_picture.qml b/tests/auto/extras/data/tst_picture.qml index 115be774a..e11d28fb6 100644 --- a/tests/auto/extras/data/tst_picture.qml +++ b/tests/auto/extras/data/tst_picture.qml @@ -56,7 +56,7 @@ import QtQuick.Extras.Private 1.0 TestCase { id: testCase name: "Tests_Picture" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/extras/data/tst_statusindicator.qml b/tests/auto/extras/data/tst_statusindicator.qml index f1621a87f..257ec7158 100644 --- a/tests/auto/extras/data/tst_statusindicator.qml +++ b/tests/auto/extras/data/tst_statusindicator.qml @@ -57,7 +57,7 @@ import QtQuick.Extras 1.4 TestCase { id: testCase name: "Tests_StatusIndicator" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/extras/data/tst_togglebutton.qml b/tests/auto/extras/data/tst_togglebutton.qml index 4b887c83b..8fd625154 100644 --- a/tests/auto/extras/data/tst_togglebutton.qml +++ b/tests/auto/extras/data/tst_togglebutton.qml @@ -54,7 +54,7 @@ import QtQuick 2.1 TestCase { id: testcase name: "Tests_ToggleButton" - visible: windowShown + visible: true when: windowShown width: 400 height: 400 diff --git a/tests/auto/testplugin/testplugin.h b/tests/auto/testplugin/testplugin.h index 8f3103721..05ce07659 100644 --- a/tests/auto/testplugin/testplugin.h +++ b/tests/auto/testplugin/testplugin.h @@ -35,7 +35,7 @@ class TestPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.playground.qtquickcontrols.QQmlExtensionInterface" FILE "testplugin.json") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "testplugin.json") public: void registerTypes(const char *uri); void initializeEngine(QQmlEngine *engine, const char *uri); diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro index dfdd1a810..7e16087a4 100644 --- a/tests/auto/testplugin/testplugin.pro +++ b/tests/auto/testplugin/testplugin.pro @@ -29,10 +29,7 @@ DESTDIR = $$TARGETPATH !equals(PWD, $$OUT_PWD) { # move qmldir alongside the plugin if shadow build - qmldirfile.input = QMLDIR - qmldirfile.output = $$DESTDIR/qmldir - qmldirfile.variable_out = PRE_TARGETDEPS - qmldirfile.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - qmldirfile.CONFIG = no_link no_clean - QMAKE_EXTRA_COMPILERS += qmldirfile + qmldirfile.files = $$QMLDIR + qmldirfile.path = $$DESTDIR + COPIES += qmldirfile } |