Commit Graph

26 Commits

Author SHA1 Message Date
Andreas Buhr b5b36db63a Fix documentation links to High DPI documentation
The documentation on High DPI was recently rewritten, renaming
several sections. This patch fixes the links which were broken
by this change.

Task-number: QTBUG-88533
Pick-to: 6.0
Change-Id: Iae9f38d722a267ba5b21db6f2ef7394a6c675d4f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-12-01 15:48:55 +01:00
Mitch Curtis d430281112 Doc: use correct casing for Material style name
Change-Id: Ia2d10b9fd27c8e83bfd8ed8ae021391ba1df50f1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-11-09 12:58:42 +01:00
Venugopal Shivashankar e3a31e9d1e Doc: Fix qdoc warnings
Mostly broken links to types and
properties that are either dropped or
renamed.

Task-number: QTBUG-88141
Fixes: QTBUG-88141
Change-Id: I44789cdd1b8560a967b0b3868fd637deef488d88
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-11-06 15:06:25 +01:00
Mitch Curtis 9219e86aa5 Rename "Default" style to "Basic"
[ChangeLog][Styles] The Default style was renamed to Basic to account
for the introduction of the platform styles (macOS, Windows), which
will be used by default (where possible) when no style is specified.

Fixes: QTBUG-85984
Task-number: QTBUG-68814
Task-number: QTBUG-86403
Change-Id: I22b3199c8662e4ee5d55a1be1a51c9856ac62376
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-09-24 13:48:49 +02:00
Mitch Curtis f872cdde21 Fix qdoc errors
Change-Id: I83f21bd6b780daa545c57d050d0f7562e8c0a4ff
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
2020-09-03 15:12:43 +02:00
Mitch Curtis 456d26e97e Remove bindings to parent in delegates
Until we've decided whether to a) document that properties of parent
should not be bound to in delegates or b) fix the warning that results
from doing so after 8c72e634b3,
we can pre-emptively clean up a few places where it happens.

Task-number: QTBUG-81976
Task-number: QTBUG-82393
Task-number: QTBUG-82989
Pick-to: 5.15
Change-Id: I1e610613f6016ec1b9cf9ca33cdfb15d384731a8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-05-11 15:57:59 +02:00
Mitch Curtis 17cc497f16 Run optipng on all images
find . -name "*.png" -exec optipng -o 7 -strip all {} \;

Change-Id: I2238b2dd38813d33ed48d79817f872f922cfa28d
Fixes: QTBUG-79275
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-11-04 13:31:34 +02:00
Nico Vertriest cc3ef6cd7a Doc: Rename section called StackView
- a section title in a tutorial shouldn't be the name of a QML type only

Task-number: QTBUG-78799
Change-Id: I661b639eb96926be2b92899fdbe241890d4ed6f4
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2019-10-01 14:40:11 +02:00
Venugopal Shivashankar f74cff42a7 Doc: Replace the "Qt Quick Controls 2" instances
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>
2019-08-22 08:32:02 +02:00
Qt Forward Merge Bot 86f09add21 Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
2018-12-05 09:19:46 +01:00
Venugopal Shivashankar 05597ef3e5 Doc: Update \titles with "Controls 2" in it
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>
2018-12-04 08:22:47 +00:00
Mitch Curtis 3c7bfc1567 Tie minor version of all imports to Qt's minor version
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>
2018-11-02 16:45:04 +00:00
Venugopal Shivashankar 1abdfe5d5a Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2
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>
2018-10-29 07:05:28 +00:00
J-P Nurmi d2d0e08e58 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.qmake.conf
	tests/auto/controls/data/tst_scrollindicator.qml

Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b
2017-07-11 12:57:13 +02:00
Venugopal Shivashankar 6f5a061b5c Doc: List the corresponding source files and images under each chapter
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>
2017-07-05 08:09:23 +00:00
J-P Nurmi ace9d50e64 Doc: fix the anchors.fill links in the Chat Tutorial
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>
2017-07-04 18:05:21 +00:00
Venugopal Shivashankar 037fe9c5c9 Doc: Improve tone at the beginning of the tutorial
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>
2017-06-28 12:20:26 +00:00
J-P Nurmi 51240b75cc Update license headers to silence qtqa/tst_license warnings
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>
2017-02-24 13:04:52 +00:00
J-P Nurmi 00a062649b Welcome to 2017
Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-01-09 17:29:40 +00:00
J-P Nurmi b13bafec9c Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
	examples/quickcontrols2/gallery/gallery.qrc
	src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/doc/qtquickcontrols2.qdocconf
	src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
	src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml
	src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml
	src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-calendarmodel.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/qtquickcontrols2plugin.cpp
	src/quicktemplates2/qquicktooltip.cpp
	src/quicktemplates2/qquicktooltip_p.h
	src/quicktemplates2/qquicktumbler.cpp
	tests/auto/controls/data/tst_spinbox.qml
	tests/auto/controls/data/tst_tumbler.qml
	tests/auto/qquickmaterialstyle/data/tst_material.qml

Change-Id: I25b7473b47739043b6f768603bece30b18021318
2016-10-03 13:31:32 +00:00
Topi Reinio 1ba9feea60 Doc: Add drop shadow for tutorial images
...Using the new \borderedimage macro.

Change-Id: I6a15944e898cd9b70bd8fd0999399d405dde9e59
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-09-27 07:10:13 +00:00
J-P Nurmi 7af626e08c Bump up all controls and templates imports to version 2.1
Controls must import templates version 2.1 in order to "inherit"
1-revisioned properties, methods, and signals. So far, this has
been done case by case, but it's less error prone and more clear
to change them all. For example, if you ever see a source file
pasted/linked somewhere, it's easy to identify the version it
belongs to.

Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-07-08 07:37:33 +00:00
Mitch Curtis bb34d8491c Remove TODO from Chat Tutorial documentation
The image doesn't need to be regenerated.

Change-Id: I47e089c0474b819308465e35dd1b0d1dc306d384
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-04-29 07:04:29 +00:00
J-P Nurmi 1ef2c051ec import Qt.labs.controls 1.0 => QtQuick.Controls 2.0
Docs, resources, .metainfo and plugins.qmltypes will be updated in
follow up commits.

Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861
Task-number: QTBUG-52549
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-04-21 15:48:05 +00:00
J-P Nurmi e358a033d4 Rename qtquickcontrols.conf to qtquickcontrols2.conf
Use the 2-suffix consistently everywhere to avoid any potential
confusion with the old controls.

Change-Id: I83aa212a15ed78b8694fb7d3db80fc8430aea969
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-04-21 05:43:19 +00:00
J-P Nurmi e8cd9c0458 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
2016-04-20 16:23:33 +02:00