| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: I859406dc779e59ee5d8e2980e04f8be28b1a69aa
|
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I65be8e54ded284d2f80b5a1f301b75223bd81bb3
Fixes: QTBUG-75338
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ia89d3600269126768ede2305dcf60d968f772fb7
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Having a section title identical to a QML type name caused links
intended to go to the QML reference to link to this page instead.
Fixes: QTBUG-77840
Change-Id: I06219a67fd384c51be6080ef7ef8579b6a405d0d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1abdfe5d5 renamed the doc module without the
version no. 2 in the name, but a bug was left
behind. The qhp.project name was still called
QtQuickControls2, while all the qhp settings
in the qdocconf were using QtQuickControls.
Task-number: QTBUG-77815
Change-Id: I1e8d10212798a1f4dfedcd7888f846e149851d23
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Now that Controls 1 is deprecated, it's ideal to use
"Qt Quick Controls" instead of "Qt Quick Controls 2".
Task-number: QTBUG-70333
Change-Id: Ie745db4b61071ddb5e06150d4e739cda74c59f41
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-74391
Change-Id: I354049c5c8edb36cb94afa4483ae177a736f2374
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: I0bc187e2a8edb4e357c1bf114dd9b1977d5c1e45
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- The correct module header name is QtQuickControls2
- Add dependency to qtgraphicaleffetcs
- RangeSlider: Move \qmlsignal commands out of \qmlpropertygroup
- Fix linking to content[Width|Height] for ScrollView
Change-Id: I1636fef5f4365a8e9f80b0b8df17e78999bfd3f8
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
According to https://material.io/design/components/buttons.html#text-button
Change-Id: Ia36a676864a8f738d204cf8db9430b797f1f2f99
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ib83e2ec925e0c37b40562aea7f11e09759ce3abc
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The cursor flash iterval can sometimes be set to 0. This is done
from e.g the iOS plugin while selecting text, since the
cursor should not flash when the user is dragging it around
inside a magnifier glass. Setting the interval to 0 simply
means "don't flash", rather than "hide the cursor". But
setting the interval of a QML Timer to 0 will cause it to
never trigger, which is not what we want, since then the
cursor can end up staying hidden if done in-between two
"flashes".
This patch will add an extra condition that checks for this case.
Fixes: QTBUG-75844
Change-Id: Ib1ca594a49a18cb161a2b2a67928fb6766984988
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
This amends 1693a19fd557c857ef4f43ab303ea1056790481e
Change-Id: I1c23d8a859e2cc2b878ddf2b6e7df35755abde22
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
This amends 1693a19fd557c857ef4f43ab303ea1056790481e
Change-Id: I70ef68de56405eb705d1c79be4eed8925def319a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I5b112e0e4021191c387da86bb5b0477fe0c4da30
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Although the doc project is named QtQuickControls,
the repo is still called qtquickcontrols2 and the
exported headers are installed under
QT_INSTALL_PREFIX/include/QtQuickControls2. By default,
Qdoc tries to look for the headers in a directory that
matches the doc project name, which is not the right
include directory in this case.
Change-Id: I77889fe35c028a2fc903d49b571a564c57326c21
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Make ItemDelegate respect highlightedText
- Change ItemDelegate's highlightedText palette role from white to
almost black (i.e inversion of "light" which is 0xFF090909),
so that text shows up against a highlighted background.
This also allows easily switching ComboBox to a dark style via palette
customization.
Fixes: QTBUG-72786
Fixes: QTBUG-74678
Change-Id: I5ad0d86de112f869edf0488d06bb308cdc900363
Reviewed-by: Massimo Callegari <massimocallegari@yahoo.it>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| | |
Change-Id: If27c142786ad2457a80ce1ef65220834eda81e94
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some history:
- f1f884d3 worked around an issue in DialogButtonBox.
- c2fd8f7d fixed it by using contentWidth; i.e. the implicit width of
the contentItem. It caused QTBUG-72372.
- I tried to fix QTBUG-72372 with 6476de0b, but created (or exposed)
QTBUG-73860.
The problem in QTBUG-73860 can be seen with the following example:
Dialog {
id: dialog
visible: true
standardButtons: Dialog.Ok
}
The single 'Ok' button here will go outside of the dialog. The
underlying issue can be seen by looking into DialogButtonBox.qml:
implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
(control.count === 1 ? contentWidth * 2 : contentWidth) + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
contentHeight + topPadding + bottomPadding)
The implicit width of the box in this case is contentWidth * 2
(there is one button, so control.count === 1). This should result in
the button taking half the width of the box and being aligned to the
right:
alignment: count === 1 ? Qt.AlignRight : undefined
...
delegate: Button {
width: control.count === 1 ? control.availableWidth / 2 : undefined
}
What actually happens is that the contentItem (ListView) is temporarily 0
until it gets its final size of 100. However, QQuickDialogButtonBox
doesn't respond to this change in the ListView's contentWidth.
This problem can be fixed by returning to c2fd8f7d's resizeContent()
implementation, which uses contentWidth.
Then, there is a second issue:
Dialog {
id: dialog
visible: true
standardButtons: Dialog.Ok
width: 300
}
The button here is also positioned outside of the box. The problem is
that the contentWidth is based on implicitContentWidth:
QQuickContainerPrivate::updateContentWidth()
{
// ...
contentWidth = implicitContentWidth;
// ...
}
implicitContentWidth is calculated by calling getContentWidth():
void QQuickControlPrivate::updateImplicitContentWidth()
{
// ...
implicitContentWidth = getContentWidth();
// ...
}
In the case of horizontal alignment,
QQuickDialogButtonBoxPrivate::getContentWidth() uses the implicit
width of the largest button:
for (int i = 0; i < count; ++i) {
QQuickItem *item = q->itemAt(i);
if (item) {
totalWidth += item->implicitWidth();
maxWidth = qMax(maxWidth, item->implicitWidth());
}
}
// ...
if ((alignment & Qt::AlignHorizontal_Mask) == 0)
totalWidth = qMax(totalWidth, count * maxWidth + totalSpacing);
The Default style button has an implicitWidth of 100.
The DialogButtonBox in the example above is 300 pixels wide, so the
button should be 150, and it is, thanks to its width binding.
However, the DialogButtonBox uses contentWidth to size its contentItem
(ListView), and the contentWidth is, as mentioned, 100: the implicit
width of the button. So, the button ends up hanging over the side
of the box, as it's larger than the box thinks it is.
This problem is fixed by setting DialogButtonBox's contentWidth to the
contentWidth of the contentItem (ListView). This makes DialogButtonBox
use the explicit widths of the buttons rather than their implicit
widths. Since the contentWidth is no longer implicit, we must also
change any use of contentWidth in the implicitWidth binding to
implicitContentWidth.
While writing auto tests for this, they caught an issue where
contentWidth wasn't updated, so now we call resizeContent() in
QQuickContainer::setContentWidth().
Change-Id: I99ffda21b47aeb14d4382e453e87c4312f343a1c
Fixes: QTBUG-72886
Fixes: QTBUG-73860
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Add SplitView and TableView.
Change-Id: Ib049d12d6e922269ac80d2e9b10f37f5e274a567
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-73484
Change-Id: I5c6019ec015a7d423dcc103d1acf23383c5b6239
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Work was probably started before 5.12 but the patch ended up getting
merged in time for 5.13. It seems that I forgot to update the versions.
Change-Id: I19edf08158cca0967a7a536b3aee326e3b393d4c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
This makes sure the qmltypes target for qml_plugin's works.
Change-Id: I4a7624aa2db2eb40b9b44f158e099c651b1249cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ibd3a8a111ce70643199c64f41143f332a34826f8
|
| |
| |
| |
| |
| | |
Change-Id: I1b34fe2df28c734395dc2a55340f2a7cb1629692
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ia84e572f6f16cc050991450a18f2e695e461280d
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
qquickfusionstyle.cpp:85:31: warning: ‘const QBrush& QPalette::background() const’ is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations]
Change-Id: I5640132d28abf15f9e4dad474b27cc8f119b4d65
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I0d52818c7b221a6434acc6c960090a13d3d9febe
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Make Active and Disabled colors closer to Widgets' Fusion style.
Task-number: QTBUG-70819
Change-Id: I61cf22eb4449b5443fa71349da8df2ff57ee9158
Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I8aded0949d38315d4d22fa511f83331d7caf3145
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In 5.11, the font palette read from the qtquickcontrols2.conf file was
respected. After some large architectural changes (around the time of
94780538) required to fix a crash, 5.12 stopped respecting these
settings.
This patch fixes the issue by setting the default font as the System
scope font, because that's what QQuickControlPrivate::parentFont() uses
as its fallback if no parent item has a font explicitly set.
QQuickControlPrivate::parentFont() is used as the starting point for
font inheritance/resolution for each control.
The same fix is used for palettes.
Change-Id: I706a9f109c9959b8ea6b91f842146dbfc876cb2b
Fixes: QTBUG-72023
Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I13c6458d7a7f92daf58c12e4c120d99a1f56cbfa
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Button's text was previously black on a dark background with macOS'
dark mode. This patch makes it more readable.
Task-number: QTBUG-70819
Change-Id: Iaa9d31133434e67e04d5d831dcb8eeba191cbab4
Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Add Dial's new inputMode property to DialSpecifics.qml
- Update plugins.qmltypes files
Fixes: QTBUG-73412
Change-Id: Id9e3818db49d6d130da1256d3019a5074902c66d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
just like the previous fix for for the highlight color: use the system
palette.
Task-number: QTBUG-70652
Change-Id: I5c31927c53ba386f54de7c46ec9fe66c26e7a31b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This allows a quick alternative to redefining the whole popup item
by just acting on palette colors.
Fixes: QTBUG-72786
Change-Id: I19e5158e2ad18fa9bf512f02d4bbe74cb06aba35
Reviewed-by: Massimo Callegari <massimocallegari@yahoo.it>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-73179
Change-Id: I99fb1c7cfcf61920889da909152b23b40bc96104
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
[ChangeLog][Controls] Added cache property to icon.
Change-Id: I9b3410e74ab8962d039939a8e005a2aff8e026cb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When a style is loaded, QtQuickControls2Plugin::loadStylePlugins() is
called. This function uses QPluginLoader to search the style directory
for the style plugin. On Windows, the code was looking for the plugin
without the debug "d" suffix, causing the style plugin to fail to load
for debug builds. This results in the QQuickTheme subclasses not being
created, causing controls to be shown with default font sizes.
This patch fixes the issue by appending the "d" suffix on Windows.
Change-Id: I706dbe39325a104bcd6ce72cb0a8d37025adb055
Fixes: QTBUG-71902
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Do as the Default style does and make the current item bold. If we
don't do this, it can be impossible to distinguish the current item
from the highlighted item, especially when the popup obscures the
button.
Change-Id: If40b9c73c207d07fb5669564cdcfcea29ebed2f1
Fixes: QTBUG-68794
Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| |\
| | |
| | |
| | | |
Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qt Creator tries to look for the example sources in this path,
before listing them in the welcome screen.
Task-number: QTBUG-71694
Change-Id: I333f380f2f8ada91865474ff95cb0df1affba9cb
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qt Quick Controls 2 module is referred to without the version number.
The landing page title still had the version number, which caused
the table of contents to fail to find the html filename.
Fix the landing page title and use the old title as a \keyword,
so any external links still continue to work.
Task-number: QTBUG-71694
Change-Id: I99e5eabf56028bd8a3180cb7161a0b0dcbdf9863
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This change makes all Qt Quick Controls 2 imports match the current
Qt minor version, which is 12 as of this patch.
It also updates all other Qt Quick imports to match.
This will also make future version bumps easier as all version numbers
in existing code/docs will match.
The following commands were used to verify that no old versions remain:
for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done
for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done
[ChangeLog] From Qt 5.12 onwards, all import versions in
Qt Quick Controls 2 follow the same minor version as Qt's
minor version number. For example, the import version for Qt 5.12 is:
"import QtQuick.Controls 2.12".
Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3
Fixes: QTBUG-71095
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Alternatively, the old \title is now a \keyword, to avoid
broken links to the page.
Change-Id: Ib8b97efe8be13559c45c7ca430b2afc93edaa3e7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: I0d2601b897e4cb8ce7a0d562927f3895d1f08f25
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Be explicit and reduce the chance for confusion.
Change-Id: I4bd912660ee32705cd9c7bdc667ccb4e255a302b
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
use the one from ... mac system palette.
Task-number: QTBUG-70652
Change-Id: I0aa9ab0596ceb8222327d9febbb132fffc3968cc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes: QTBUG-63834
Change-Id: I8ba52d68a878ec61337e8111d233409a9a98f47d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|