| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I9130e8d143b1f6b2ac6ec2839e47858db3e67dff
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
|
|
|
| |
qtquickcontrols2-automotive.qdoc:28: (qdoc) warning: EXAMPLE PATH DOES NOT EXIST: automotive
qtquickcontrols2-musicplayer.qdoc:28: (qdoc) warning: EXAMPLE PATH DOES NOT EXIST: musicplayer
qquickspinbox.cpp:814: (qdoc) warning: Can't link to 'textFromValue()'
Change-Id: Iec6fd398cca98b514a76fe9f2f30c79a59b81457
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\
| |
| |
| | |
Change-Id: I7c0333dbf959124f6cf5be7837a305b65c08d290
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Using either :/ or qrc:/ will work because we handle both cases
in QQuickImagineStyle::url(), but for local file paths, we don't
have any handling for the file:// prefix. This patch just makes
the examples more consistent. A follow up patch will document examples
of specifying the different types of paths.
Change-Id: Ib7fc2fe012242f9b225b4380ca066107b77d0680
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/quicktemplates2/qquickabstractbutton_p.h
Change-Id: I265cbd2ce51beaf2afef99292c2e2798dadb4ba3
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
examples/quickcontrols2/quickcontrols2.pro
src/imports/controls/ComboBox.qml
src/quicktemplates2/qquickabstractbutton.cpp
src/quicktemplates2/qquickabstractbutton_p.h
src/quicktemplates2/qquickapplicationwindow_p.h
src/quicktemplates2/qquickcombobox.cpp
src/quicktemplates2/qquickcontainer.cpp
src/quicktemplates2/qquickcontrol.cpp
src/quicktemplates2/qquickcontrol_p.h
src/quicktemplates2/qquickcontrol_p_p.h
src/quicktemplates2/qquicklabel_p.h
src/quicktemplates2/qquicklabel_p_p.h
src/quicktemplates2/qquickslider_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquicktextarea_p.h
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p.h
src/quicktemplates2/qquicktextfield_p_p.h
tests/auto/auto.pro
tests/auto/controls/data/tst_combobox.qml
Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes compile with disabled widgets module.
Task-number: QTBUG-64761
Change-Id: I743884d77d51e89061d87cab006bab0cafc9ddb7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/quickcontrols2/qquickchecklabel.cpp
src/quickcontrols2/qquickchecklabel_p.h
src/quickcontrols2/qquickmnemoniclabel_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipedelegate.cpp
Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: If285e90d25d497155c060907b8f8c60859e55a9a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I7d7e49d0d4e1cbd61892215677c7ea0c5471af02
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I7a691f7b7c3d2f2a9f1d9a1ded29269184ddfcfe
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|/ /
| |
| |
| |
| | |
Change-Id: Ib7dc6679748dc6c88f7bad3896b2e2e3b048c987
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Fixed pucntuation issues and typos
- Removed redundant text
Task-number: QTBUG-60647
Change-Id: I1ab0e8e62a2e3f4997629653b659f130c13db007
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
tests/auto/controls/data/tst_scrollindicator.qml
Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Updated the corresponding qml files where these images are used.
The spaces in file name stops qdoc from listing the file in the
example page.
Change-Id: I45b24ec88d367fe229fe365eeb611b86de805e0d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There was a QDoc warning:
qtquickcontrols2-chattutorial.qdoc:28: warning: Can't link to 'anchors.fill'
and the anchors.fill links weren't actually linking to the anchors
property but just to the beginning of the QML Item docs.
Change-Id: I66f66765443e5b75af8198309f9f7482e70ea2d3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In a tutorial such as this, listing all the example files and images
at once towards end of it is confusing. Qdoc enables to turn off the
auto-generated list and explicitly list the files wherever necessary.
Change-Id: Ifbb258af5ad35bd2df976eb793a14fd5873ceed9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/quicktemplates2/qquickmenu.cpp
Change-Id: I595ed1671fcad6c3b87123be2b825bca09552f0f
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The tutorial now sounds like it is leading the reader through a series
of changes to the default code that came with the "Qt Quick" application
template.
Change-Id: I6e46e720df9668dff435541ebd97bdaa6a7c02ad
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
[ChangeLog][Controls][ApplicationWindow] Deprecated the overlay grouped
property in favor of the newly introduced Overlay attached properties.
[ChangeLog][Controls][Overlay] Introduced Overlay attached properties
and signals that supersede the overlay grouped property in Application
Window. The Overlay attached type allows providing background dimming
for popups without requiring an ApplicationWindow instance.
Task-number: QTBUG-61336
Change-Id: I9df11bcb167e7725014d5f058fe24d70da4a10b3
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fusion style ComboBox popup height was adjusted according to 90a0d402
to make tst_controls::ComboBox::test_emptyPopupAfterModelCleared pass
with the Fusion style.
Conflicts:
src/imports/controls/ComboBox.qml
src/imports/controls/material/ComboBox.qml
src/imports/controls/universal/ComboBox.qml
Change-Id: I2bad826dc56de9d8952ea2a9ace950c7cf3cbc58
|
| |\
| | |
| | |
| | | |
Change-Id: Iba044084bf82f6b2b8ceba4aa2a80bdcf8fc38e0
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Even though retina screens are not the primary target of the wearable
demo, users can try out the demo on desktop. Provide crispy @2x image
assets to give a better impression for those who have retina screens.
Change-Id: If88367e14c586fd9718f43bbae73dee547d54aaf
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/quicktemplates2/qquickrangeslider.cpp
Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the code was originally meant to link the plugin if it's not built into
qtsql. this logic did not survive the various build system refactorings,
but it's also entirely pointless, because available static plugins are
now automatically linked.
Change-Id: If4b5bb3387f21aef98aa55257dd5b94f953822c5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ToolButton was changed to tint the icon so that it always follows the
foreground color. Thus, it's no longer necessary to ship white versions
of the icons for the Material style.
Change-Id: Ibe5accc1b39559c9dfc2f94fbf3c9c323b91fe63
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|/
|
|
|
| |
Change-Id: I275856925ebf82c0ed8822d45299fd4d5c9218ba
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: Ie7ad814b3999791801c60776777c6a736db1c093
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
| |
Menus, dialogs, and drawers already handle it out of the box,
but for page/stack navigation we need an explicit shortcut.
Change-Id: Iad3e05f0fc31dbd66e3b1aa9286f8ef076fcff0d
Task-number: QTBUG-58105
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Separate the icon and its background to make the background stylable
and to provide the icons in high DPI versions later. Some icon files
have been renamed to match the sub-app name. When this example reaches
dev, we can use the built-in icon support with named icons.
Change-Id: Id87d1a001476194eb7e803802c90e7089f92b3b1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The demo was originally written to become a Qt Quick demo. Focus
on the QQC2 specifics now that it became a QQC2 demo instead. There
were also some outdated references after being refactored a bit
after the initial submission.
Change-Id: I96ef3f4745a295b2d8ab12a30fcbdf41a2c50626
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: Ia4896fd2253cea9bc83bdd59bfdbaace216a9cb9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: I0ed565b04236ad4550b278e0a223636794d52bbf
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: Iaed6c6370e9a8ec7e6e523ee87802d51531f5bba
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: Idc8376405e113a9837fbe43fbf85681cf9ed8737
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: I3e6a3ffbcca962602d08aa9effce981396cc3cdb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: I9389597db13acee93e66ee6979fae5e2dd5a0e90
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: I918e69a8396cf57dd685cc2116722618a3d7fda4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
| |
Move bottom margin from anchors as bottom padding to define it once.
Change-Id: I2a93f86e2029c38f1d39555a55d969faec716d04
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
| |
Change-Id: Ic0071690388871fcbb09af5f3b7255f1a7f81bcd
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Almost all pages were centering a fixed-size SwipeView. If the window
was larger than assumed, swipes would only work in the center are of
the window. Therefore it's better to stretch the view, and just center
the content instead. This way swipes work consistently in the whole
content area of the page.
Change-Id: Idc2a2bc327a49314cbf1271fa34b74df5f633ed8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: Ie378f19a1ccfd962528f47263d03cac6bf7dc03f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
|
|
|
|
| |
Replace the SettingsData (Item) type with QML Settings from
Qt.labs.settings, and get rid of an unnecessary wrapper items
and hard-coded image sizes.
Change-Id: If41fbef5247c1648b881a97cbb94d4378b334f85
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
| |
Change-Id: Id8f4948372f394ec5dbb4c2268f453724f65b594
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
| |
To be consistent how the pages/apps are called in the UI vs. code.
Change-Id: I721d3ebb8631aa97a1ab43e6924cd0e4d0f39d24
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
|
|
|
|
|
| |
Change-Id: I2c9bf50b1519976643bebe87198c02fcdca45a64
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
| |
Move the app title outside the delegate. Its position is static,
and its visible in one place only, so one instance is enough.
Change-Id: If5a9f4cb7893980cef6a08fdc8adde929f187460
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
| |
Even the code and the documentation talks about "pages", so call the
types pages too.
Change-Id: Ie0151be1b2344af6f7122ed22da6cc3b1ea634e4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
| |
Utilize the header-content-footer layout of AppWindow.
Change-Id: I50a53fd5c372161af738e5d53085c669cf2614b8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|
|
|
|
|
|
|
| |
Replace the hand-made home/back buttons with an AbstractButton-based
custom type.
Change-Id: Icc2555e9ef67ae7461a072caf2dae780aaeafba2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|