diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:34:35 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:34:35 +0100 |
commit | bada5f8ea74d6d9d2a60b35f4d271da143aced51 (patch) | |
tree | 7b936bc66691fec2efee0a2f8685b06fdac36497 /examples/activeqt/simpleqml/simpleqml.ico | |
parent | c550735ebeb937a36b82c161f0fed4e35b8776bb (diff) | |
parent | 555527b6992374f8a5139674a316e819f9d5685f (diff) |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
src/activeqt/control/qaxserverbase.cpp
Change-Id: Ic47ed12f7acf788b923571d1e3515ececd986a19
Diffstat (limited to 'examples/activeqt/simpleqml/simpleqml.ico')
-rw-r--r-- | examples/activeqt/simpleqml/simpleqml.ico | bin | 0 -> 766 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/activeqt/simpleqml/simpleqml.ico b/examples/activeqt/simpleqml/simpleqml.ico Binary files differnew file mode 100644 index 0000000..c80d36a --- /dev/null +++ b/examples/activeqt/simpleqml/simpleqml.ico |