diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
| commit | c6713e212ef0b97c45d6466b73220567e94a05f1 (patch) | |
| tree | 8774d26bf05f2087c510d16da42bfd0dc59a54b1 /examples/quickcontrols/controls/texteditor/qml/images | |
| parent | ce97d9c8ef4e6f8cb2166065b6732cad3cccf604 (diff) | |
| parent | 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb59 (diff) | |
| download | qtquickcontrols-c6713e212ef0b97c45d6466b73220567e94a05f1.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/quickcontrols/extras/flat/main.cpp
src/controls/Private/qquickcontrolsettings.cpp
Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
Diffstat (limited to 'examples/quickcontrols/controls/texteditor/qml/images')
20 files changed, 0 insertions, 0 deletions
diff --git a/examples/quickcontrols/controls/texteditor/qml/images/editcopy.png b/examples/quickcontrols/controls/texteditor/qml/images/editcopy.png Binary files differnew file mode 100644 index 00000000..f5513644 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/editcopy.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/editcut.png b/examples/quickcontrols/controls/texteditor/qml/images/editcut.png Binary files differnew file mode 100644 index 00000000..a784fd57 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/editcut.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/editpaste.png b/examples/quickcontrols/controls/texteditor/qml/images/editpaste.png Binary files differnew file mode 100644 index 00000000..64c0b2d6 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/editpaste.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/editredo.png b/examples/quickcontrols/controls/texteditor/qml/images/editredo.png Binary files differnew file mode 100644 index 00000000..8875bf24 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/editredo.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/editundo.png b/examples/quickcontrols/controls/texteditor/qml/images/editundo.png Binary files differnew file mode 100644 index 00000000..a3bd5e0b --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/editundo.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/exportpdf.png b/examples/quickcontrols/controls/texteditor/qml/images/exportpdf.png Binary files differnew file mode 100644 index 00000000..ebb44e6b --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/exportpdf.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/filenew.png b/examples/quickcontrols/controls/texteditor/qml/images/filenew.png Binary files differnew file mode 100644 index 00000000..d3882c7b --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/filenew.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/fileopen.png b/examples/quickcontrols/controls/texteditor/qml/images/fileopen.png Binary files differnew file mode 100644 index 00000000..fc06c5ec --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/fileopen.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/fileprint.png b/examples/quickcontrols/controls/texteditor/qml/images/fileprint.png Binary files differnew file mode 100644 index 00000000..10ca56c8 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/fileprint.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/filesave.png b/examples/quickcontrols/controls/texteditor/qml/images/filesave.png Binary files differnew file mode 100644 index 00000000..b41ecf53 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/filesave.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/qt-logo.png b/examples/quickcontrols/controls/texteditor/qml/images/qt-logo.png Binary files differnew file mode 100644 index 00000000..be1bb106 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/qt-logo.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/textbold.png b/examples/quickcontrols/controls/texteditor/qml/images/textbold.png Binary files differnew file mode 100644 index 00000000..38400bd1 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/textbold.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/textcenter.png b/examples/quickcontrols/controls/texteditor/qml/images/textcenter.png Binary files differnew file mode 100644 index 00000000..2ef5b2ee --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/textcenter.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/textitalic.png b/examples/quickcontrols/controls/texteditor/qml/images/textitalic.png Binary files differnew file mode 100644 index 00000000..0170ee26 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/textitalic.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/textjustify.png b/examples/quickcontrols/controls/texteditor/qml/images/textjustify.png Binary files differnew file mode 100644 index 00000000..39cd6c1a --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/textjustify.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/textleft.png b/examples/quickcontrols/controls/texteditor/qml/images/textleft.png Binary files differnew file mode 100644 index 00000000..83a66d55 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/textleft.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/textright.png b/examples/quickcontrols/controls/texteditor/qml/images/textright.png Binary files differnew file mode 100644 index 00000000..e7c04645 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/textright.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/textunder.png b/examples/quickcontrols/controls/texteditor/qml/images/textunder.png Binary files differnew file mode 100644 index 00000000..968bac5e --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/textunder.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/zoomin.png b/examples/quickcontrols/controls/texteditor/qml/images/zoomin.png Binary files differnew file mode 100644 index 00000000..d46f5aff --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/zoomin.png diff --git a/examples/quickcontrols/controls/texteditor/qml/images/zoomout.png b/examples/quickcontrols/controls/texteditor/qml/images/zoomout.png Binary files differnew file mode 100644 index 00000000..46326566 --- /dev/null +++ b/examples/quickcontrols/controls/texteditor/qml/images/zoomout.png |
