diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:58:32 +0200 |
commit | 17198e03ab36e5f579a1477b09cc3e601975eb5f (patch) | |
tree | 61ba826e9edd53469abdc1e1f58b1223d0336c56 /examples/widgets/widgets/icons | |
parent | a5e89005445ac8ca18ac046eaf55fe2230e47cd6 (diff) | |
parent | 2e2b32a9ab459f6618d02e4b454c75a787172def (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/corelib/global/qglobal.cpp
src/corelib/tools/qstring.cpp
src/network/socket/qabstractsocket.cpp
src/network/socket/qnativesocketengine_unix.cpp
src/plugins/platforms/eglfs/api/qeglfsglobal.h
Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
Diffstat (limited to 'examples/widgets/widgets/icons')
-rw-r--r-- | examples/widgets/widgets/icons/images/designer.png | bin | 4205 -> 3604 bytes |
-rw-r--r-- | examples/widgets/widgets/icons/images/qt_extended_16x16.png | bin | 524 -> 1263 bytes |
-rw-r--r-- | examples/widgets/widgets/icons/images/qt_extended_32x32.png | bin | 892 -> 15518 bytes |
-rw-r--r-- | examples/widgets/widgets/icons/images/qt_extended_48x48.png | bin | 1294 -> 789 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/examples/widgets/widgets/icons/images/designer.png b/examples/widgets/widgets/icons/images/designer.png Binary files differindex 0988fcee3f..9f8578b49e 100644 --- a/examples/widgets/widgets/icons/images/designer.png +++ b/examples/widgets/widgets/icons/images/designer.png diff --git a/examples/widgets/widgets/icons/images/qt_extended_16x16.png b/examples/widgets/widgets/icons/images/qt_extended_16x16.png Binary files differindex bee4e7d6cd..30bcb45ed2 100644 --- a/examples/widgets/widgets/icons/images/qt_extended_16x16.png +++ b/examples/widgets/widgets/icons/images/qt_extended_16x16.png diff --git a/examples/widgets/widgets/icons/images/qt_extended_32x32.png b/examples/widgets/widgets/icons/images/qt_extended_32x32.png Binary files differindex 6e7d000c04..d609c1e1e5 100644 --- a/examples/widgets/widgets/icons/images/qt_extended_32x32.png +++ b/examples/widgets/widgets/icons/images/qt_extended_32x32.png diff --git a/examples/widgets/widgets/icons/images/qt_extended_48x48.png b/examples/widgets/widgets/icons/images/qt_extended_48x48.png Binary files differindex 7a93d88900..0e524fed5f 100644 --- a/examples/widgets/widgets/icons/images/qt_extended_48x48.png +++ b/examples/widgets/widgets/icons/images/qt_extended_48x48.png |