diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:01:33 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:26:32 +0100 |
commit | 66031e932c321ccb936e254b5d1810fa633c6cb0 (patch) | |
tree | cf7353cbc0915dcd589dcdd1aa3e35c1e5ca78bb /src/effects/RectangularGlow.qml | |
parent | a91ae64393b94717bb297de5c32b452d290ac048 (diff) | |
parent | ddee9ff8217d307b962c033ea632bfe3ef683acc (diff) | |
download | qtgraphicaleffects-5.10.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: I77989277bff5d59235f4195a95637bdab5325fed
Diffstat (limited to 'src/effects/RectangularGlow.qml')
0 files changed, 0 insertions, 0 deletions