This should ensure that the examples give the same
message as the documentation. In addition,
dropped a phrase about Qt Quick Controls claiming
that it is designed for mobile and embedded. The
latest version of controls covers the entire spectrum.
Change-Id: Ia856fa47a6e6fc35f80bedc549378a00c7fbbc2a
Pick-to: 5.15
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
All QFontDatabase APIs are static, use them accordingly.
Task-number: QTBUG-88114
Change-Id: Iae40e1354eaa6a6098a9fdbce9e237a9f498cc7d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
As well as the MACOSX_BUNDLE properties as necessary.
Task-number: QTBUG-87664
Change-Id: I1113701f04a16b05b03fbb1a49f131c84659cdcb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Also cleanup documentation, with the exception of the "High-DPI
Support in Qt Quick Controls" page, which needs to be either
removed or rewritten after some fact checking.
Change-Id: I3cdf1f8554f8f26627a9a5f17c2ee0038c933468
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
After the type registration changes, importing a style explicitly
will cause that style's QML types to be used, so applications
should put style-specific code into file-selected directories if
they need to support multiple styles.
[ChangeLog][Important Behavior Changes] Due to the recent type
registration changes, importing a style explicitly (e.g.
"import QtQuick.Controls.Material") now registers that style's
QML types in addition to making its API (attached, singleton, etc.)
available. For this reason, it is now advised to have style-specific
code in a separate QML file and use file selectors if your application
supports more than one style. If your style only supports one style,
importing that style explicitly will work as expected.
For example, if you use Material.foreground in your QML code and your
application supports more than one style, you should refactor the code
that uses the binding into its own file; e.g.
+Material/MyComponent.qml.
Fixes: QTBUG-86263
Change-Id: I38e40ff4f20f61218550ad73945dafb912193466
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
As of Qt 6, the latest version will be used by default. This saves us a
lot of effort in terms of version bumps.
Task-number: QTBUG-82922
Change-Id: I74eba8185ec3ccc75bc293d4b2ea87d59e2d9928
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
The example still loads an HTML file from resources by default, but now
it's possible to give either a relative or absolute file path on the
command line to load an html, markdown or plain text file. Alternatively
you can use the file dialog to load any of these types. We assume that
any resources (such as images) with relative paths are to be loaded from
the directory where the source text file is.
Pick-to: 5.15
Change-Id: I37bc2d6aa2306016453770dc2fd66efa41a16618
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This is getting its own repository as part of the move to the
marketplace.
Task-number: QTBUG-84172
Pick-to: 5.15
Change-Id: I2f963c298d6ef95e0832f95aa1e1ea809f4867a2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
moc now stores the QMetaType of properties as a result of
46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires
full type information about the property type inside the moc generated
source file.
Many of the property types were forward-declared, and this resulted
in build errors like
"invalid application of 'sizeof' to an incomplete type 'QQuickTransition'"
Make sure to explicitly include the moc files inside the counterpart
.cpp files, so that full information is available from included headers.
Fixes: QTBUG-82774
Change-Id: I5971713864992398daed72ce9f6ab866668cf8e1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Ensure that all members are initialized and remove an unused member.
Change-Id: Ibfb3ea86b7791cd6f8683b68e7cd3bc4256b33f7
Reviewed-by: Shawn Rutledge <shawn.rutledge@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>
Add a modified property to the document and add
handling in onClosing(). Connect the actions to
call close() instead of Qt.quit() for it to
become active.
Change-Id: I0fec75629db64e91508ed8ba45d4fb60be146b1b
Reviewed-by: Mitch Curtis <mitch.curtis@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>
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>
The name of the documentation module is also changed from 'qtquickcontrols2'
to 'qtquickcontrols', and this is reflected in other modules' dependencies
and licensing source files (qt_attribution.json).
Task-number: QTBUG-70333
Change-Id: I2ba308b7eddae3af00dfb49a751cac8527c46bba
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Sync with the qtbase/header.XXX. The license headers were matching
qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings:
Old license being used for foo.qdoc
Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Replaced the png image with two jpeg images, one for desktop and touch.
Change-Id: I5073244fdf82c70309e4412a51af02bbe0469c36
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
It was already possible to specify QT_FILE_SELECTORS=touch, but in
Qt Creator, it's more convenient to specify a command line argument
than an environment variable.
Change-Id: I83a86aa88fb0c229d9bcedb6646351f0675db199
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
A style-independent way to get light foreground color.
Change-Id: Idf43020d0724af993723143d74a2b1f8ab467c1e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
The comments refer to the original code that was setting a declarative
source property in the Component.onCompleted signal handler, but this
does not really apply anymore now that we have an imperative method to
load document contents.
Change-Id: I9054cbc6ecec2c66d65251c49a5b1de2ad0623dc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Follow the same convention that ColorDialog, FontDialog and FolderDialog.
Change-Id: I960d4fc1ba275ab997f2a079a799d2b90796eca3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
This is consistent with the QML FontDialog from QtQuick Dialogs 1.
Change-Id: I14a5a313be5ba9a9e0fb1645fe272cf9c2cdd389
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
This is consistent with the QML ColorDialog from QtQuick Dialogs 1.
Change-Id: I4068a98156494eb36b2d9ecf4c1af90ad173bb97
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
We want to keep the selection even if the editor loses focus when
a color or font dialog is opened. The selected color or font should
naturally apply to the whole text selection that was there before
the dialog was opened.
Change-Id: I76e6b95f979a090533b028be76e7b2cf1fd53e99
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
"F" looks a bit silly. Even though most word processing applications
seem to use the "A" icon with a bar underneath it for the text color,
we want to use it to represent the button that opens the font dialog,
since we don't use comboboxes for that.
Change-Id: I3cc60ffbe388644cdcbd9e8ec0dcffbc041aa124
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Venugopal Shivashankar
Volker Hilsheimer
Alexandru Croitor
Mårten Nordheim
Mitch Curtis
Shawn Rutledge
Karsten Heimrich
Samuli Piippo
Leander Beernaert
Friedemann Kleint
Qt Forward Merge Bot
J-P Nurmi