summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qdockwidget.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-05 19:33:25 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-05 19:33:26 +0200
commit6feec9da93032d11a768802ac2187d9d4153b1ec (patch)
treedada90d2b99127de0be833ded5554b37169f3432 /src/widgets/widgets/qdockwidget.cpp
parentd5e3dca8c56f60e0da5d707dbbe0c424b75c947a (diff)
parentc3605980d95f28d8ab6dc11eb349ad87ed3adaa9 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'src/widgets/widgets/qdockwidget.cpp')
0 files changed, 0 insertions, 0 deletions