diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:36:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:39:20 +0100 |
| commit | 6755ec891a1740110c48895afd53d39e8370704a (patch) | |
| tree | 982606f3bc582262e4b315a63f55ccb141fff97b /doc/src/images | |
| parent | 449204f8c0d6679ae0e58dbb8a30b8a86fbdb4ec (diff) | |
| parent | 00c9ec63a552d040e851b561c11428fabf1a2b08 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure
qmake/Makefile.unix.macos
qmake/Makefile.unix.win32
qmake/generators/win32/msvc_vcproj.cpp
src/3rdparty/pcre/qt_attribution.json
src/corelib/io/qsettings.cpp
src/corelib/kernel/qdeadlinetimer.cpp
src/platformsupport/kmsconvenience/qkmsdevice.cpp
src/platformsupport/kmsconvenience/qkmsdevice_p.h
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
tests/manual/qstorageinfo/printvolumes.cpp
tools/configure/configureapp.cpp
Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e
Diffstat (limited to 'doc/src/images')
16 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/analogclock-example.png b/doc/src/images/analogclock-example.png Binary files differindex b195f8bf24..2319c2891b 100644 --- a/doc/src/images/analogclock-example.png +++ b/doc/src/images/analogclock-example.png diff --git a/doc/src/images/calculator-example.png b/doc/src/images/calculator-example.png Binary files differindex 6f1158d733..9771c4132a 100644 --- a/doc/src/images/calculator-example.png +++ b/doc/src/images/calculator-example.png diff --git a/doc/src/images/calendarwidgetexample.png b/doc/src/images/calendarwidgetexample.png Binary files differindex 464be90999..407d9ed46c 100644 --- a/doc/src/images/calendarwidgetexample.png +++ b/doc/src/images/calendarwidgetexample.png diff --git a/doc/src/images/charactermap-example.png b/doc/src/images/charactermap-example.png Binary files differindex c1f25a5b83..cceb9a85d8 100644 --- a/doc/src/images/charactermap-example.png +++ b/doc/src/images/charactermap-example.png diff --git a/doc/src/images/codeeditor-example.png b/doc/src/images/codeeditor-example.png Binary files differindex b17640695d..32cf94779f 100644 --- a/doc/src/images/codeeditor-example.png +++ b/doc/src/images/codeeditor-example.png diff --git a/doc/src/images/digitalclock-example.png b/doc/src/images/digitalclock-example.png Binary files differindex 917035a0f0..21fa33b258 100644 --- a/doc/src/images/digitalclock-example.png +++ b/doc/src/images/digitalclock-example.png diff --git a/doc/src/images/groupbox-example.png b/doc/src/images/groupbox-example.png Binary files differindex 443f812340..56f95fa8b1 100644 --- a/doc/src/images/groupbox-example.png +++ b/doc/src/images/groupbox-example.png diff --git a/doc/src/images/imageviewer-example.png b/doc/src/images/imageviewer-example.png Binary files differindex 69b4f7ade7..922aa8b92c 100644 --- a/doc/src/images/imageviewer-example.png +++ b/doc/src/images/imageviewer-example.png diff --git a/doc/src/images/lineedits-example.png b/doc/src/images/lineedits-example.png Binary files differindex ff5e3184ad..6db951cd4a 100644 --- a/doc/src/images/lineedits-example.png +++ b/doc/src/images/lineedits-example.png diff --git a/doc/src/images/movie-example.png b/doc/src/images/movie-example.png Binary files differindex 713f56347e..81f2cdd6ef 100644 --- a/doc/src/images/movie-example.png +++ b/doc/src/images/movie-example.png diff --git a/doc/src/images/scribble-example.png b/doc/src/images/scribble-example.png Binary files differindex 54091baa6b..497865e44c 100644 --- a/doc/src/images/scribble-example.png +++ b/doc/src/images/scribble-example.png diff --git a/doc/src/images/spinboxes-example.png b/doc/src/images/spinboxes-example.png Binary files differindex 14c42d2404..432ff10a9b 100644 --- a/doc/src/images/spinboxes-example.png +++ b/doc/src/images/spinboxes-example.png diff --git a/doc/src/images/styles-enabledwood.png b/doc/src/images/styles-enabledwood.png Binary files differindex 168c1d2d2c..4f3a746ef9 100644 --- a/doc/src/images/styles-enabledwood.png +++ b/doc/src/images/styles-enabledwood.png diff --git a/doc/src/images/tetrix-example.png b/doc/src/images/tetrix-example.png Binary files differindex c9764dcccd..2c3dade394 100644 --- a/doc/src/images/tetrix-example.png +++ b/doc/src/images/tetrix-example.png diff --git a/doc/src/images/wiggly-example.png b/doc/src/images/wiggly-example.png Binary files differindex b20fbc445d..5ac0d856b3 100644 --- a/doc/src/images/wiggly-example.png +++ b/doc/src/images/wiggly-example.png diff --git a/doc/src/images/windowflags-example.png b/doc/src/images/windowflags-example.png Binary files differindex 9028b9b0d1..89730bcc7e 100644 --- a/doc/src/images/windowflags-example.png +++ b/doc/src/images/windowflags-example.png |
