diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-19 13:25:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-19 16:12:34 +0200 |
| commit | ce09ef431373f45d14ce0a6e7de24aee3666093d (patch) | |
| tree | 7c998b21f02db55e233e7eeb1599663f1c6b51ca /src/widgets/doc/images | |
| parent | 7ad55ca65f42351e231f31f7a9253ae6eaf1ebb3 (diff) | |
| parent | 97eec16e4ff6367c233f8ea6c4a343c286c3a514 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/windows/qwindowscontext.cpp
src/plugins/platforms/windows/windows.pri
src/tools/uic/cpp/cppwriteinitialization.cpp
src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
Diffstat (limited to 'src/widgets/doc/images')
| -rw-r--r-- | src/widgets/doc/images/fusion-style.png | bin | 0 -> 69799 bytes |
| -rw-r--r-- | src/widgets/doc/images/macos-lineedit.png | bin | 0 -> 1401 bytes |
| -rw-r--r-- | src/widgets/doc/images/macos-progressbar.png | bin | 0 -> 237 bytes |
| -rw-r--r-- | src/widgets/doc/images/macos-style.png | bin | 0 -> 32908 bytes |
| -rw-r--r-- | src/widgets/doc/images/macos-style2.png | bin | 0 -> 54822 bytes |
| -rw-r--r-- | src/widgets/doc/images/macos-tabwidget.png | bin | 0 -> 5406 bytes |
| -rw-r--r-- | src/widgets/doc/images/windows-style.png | bin | 0 -> 69987 bytes |
| -rw-r--r-- | src/widgets/doc/images/windows-style2.png | bin | 0 -> 107675 bytes |
| -rw-r--r-- | src/widgets/doc/images/windows-vista-style.png | bin | 0 -> 65394 bytes |
| -rw-r--r-- | src/widgets/doc/images/windows-xp-style.png | bin | 0 -> 61293 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/src/widgets/doc/images/fusion-style.png b/src/widgets/doc/images/fusion-style.png Binary files differnew file mode 100644 index 0000000000..753bb2806a --- /dev/null +++ b/src/widgets/doc/images/fusion-style.png diff --git a/src/widgets/doc/images/macos-lineedit.png b/src/widgets/doc/images/macos-lineedit.png Binary files differnew file mode 100644 index 0000000000..765f30ab2f --- /dev/null +++ b/src/widgets/doc/images/macos-lineedit.png diff --git a/src/widgets/doc/images/macos-progressbar.png b/src/widgets/doc/images/macos-progressbar.png Binary files differnew file mode 100644 index 0000000000..79be5f559c --- /dev/null +++ b/src/widgets/doc/images/macos-progressbar.png diff --git a/src/widgets/doc/images/macos-style.png b/src/widgets/doc/images/macos-style.png Binary files differnew file mode 100644 index 0000000000..818e634632 --- /dev/null +++ b/src/widgets/doc/images/macos-style.png diff --git a/src/widgets/doc/images/macos-style2.png b/src/widgets/doc/images/macos-style2.png Binary files differnew file mode 100644 index 0000000000..728b407428 --- /dev/null +++ b/src/widgets/doc/images/macos-style2.png diff --git a/src/widgets/doc/images/macos-tabwidget.png b/src/widgets/doc/images/macos-tabwidget.png Binary files differnew file mode 100644 index 0000000000..d189dbae3c --- /dev/null +++ b/src/widgets/doc/images/macos-tabwidget.png diff --git a/src/widgets/doc/images/windows-style.png b/src/widgets/doc/images/windows-style.png Binary files differnew file mode 100644 index 0000000000..f11a4510c3 --- /dev/null +++ b/src/widgets/doc/images/windows-style.png diff --git a/src/widgets/doc/images/windows-style2.png b/src/widgets/doc/images/windows-style2.png Binary files differnew file mode 100644 index 0000000000..168963cfde --- /dev/null +++ b/src/widgets/doc/images/windows-style2.png diff --git a/src/widgets/doc/images/windows-vista-style.png b/src/widgets/doc/images/windows-vista-style.png Binary files differnew file mode 100644 index 0000000000..f28270007f --- /dev/null +++ b/src/widgets/doc/images/windows-vista-style.png diff --git a/src/widgets/doc/images/windows-xp-style.png b/src/widgets/doc/images/windows-xp-style.png Binary files differnew file mode 100644 index 0000000000..7b323dd69b --- /dev/null +++ b/src/widgets/doc/images/windows-xp-style.png |
