diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-08 09:11:39 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-08 09:11:39 +0200 |
| commit | 38be5b605a844693bb93d24fab8c721bec273003 (patch) | |
| tree | bd8f5271078bca73acb1c33d7ee6f6f5a02b6a59 /src/imports/controls/doc/images | |
| parent | 20d141034b48ae73eee70743dc410d35491cd00f (diff) | |
| parent | a5f8ceee8547c3447675d1c4e70f5706bbd2bd99 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickmenu.cpp
src/quicktemplates2/qquickmenu_p.h
src/quicktemplates2/qquickpopup.cpp
tests/auto/auto.pro
Change-Id: I856a022d38abd84763127539f46ef032ddc53c3d
Diffstat (limited to 'src/imports/controls/doc/images')
12 files changed, 0 insertions, 0 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png b/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png Binary files differnew file mode 100644 index 00000000..5afcb6d7 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-dark.png b/src/imports/controls/doc/images/qtquickcontrols2-material-dark.png Binary files differindex 8afb2cd6..eb0350dd 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-material-dark.png +++ b/src/imports/controls/doc/images/qtquickcontrols2-material-dark.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-light.png b/src/imports/controls/doc/images/qtquickcontrols2-material-light.png Binary files differnew file mode 100644 index 00000000..2635de68 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-material-light.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-purple.png b/src/imports/controls/doc/images/qtquickcontrols2-material-purple.png Binary files differnew file mode 100644 index 00000000..8afb2cd6 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-material-purple.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material-thumbnail.png b/src/imports/controls/doc/images/qtquickcontrols2-material-thumbnail.png Binary files differnew file mode 100644 index 00000000..c1084673 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-material-thumbnail.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material.png b/src/imports/controls/doc/images/qtquickcontrols2-material.png Binary files differdeleted file mode 100644 index 4caef89e..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-material.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-styles.png b/src/imports/controls/doc/images/qtquickcontrols2-styles.png Binary files differnew file mode 100644 index 00000000..aae046fd --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-styles.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-dark.png b/src/imports/controls/doc/images/qtquickcontrols2-universal-dark.png Binary files differindex ec459457..2d6937c7 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-universal-dark.png +++ b/src/imports/controls/doc/images/qtquickcontrols2-universal-dark.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-light.png b/src/imports/controls/doc/images/qtquickcontrols2-universal-light.png Binary files differnew file mode 100644 index 00000000..a6da6f7f --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-universal-light.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-thumbnail.png b/src/imports/controls/doc/images/qtquickcontrols2-universal-thumbnail.png Binary files differnew file mode 100644 index 00000000..a189ed72 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-universal-thumbnail.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal-violet.png b/src/imports/controls/doc/images/qtquickcontrols2-universal-violet.png Binary files differnew file mode 100644 index 00000000..ec459457 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-universal-violet.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal.png b/src/imports/controls/doc/images/qtquickcontrols2-universal.png Binary files differdeleted file mode 100644 index b50d9cca..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-universal.png +++ /dev/null |
