summaryrefslogtreecommitdiffstats
path: root/examples/dbus
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-04-11 07:47:21 +0200
committerLiang Qi <liang.qi@qt.io>2019-04-11 07:47:21 +0200
commitc7af193d2e49e9f10b86262e63d8d13abf72b5cf (patch)
tree7ca5d4ba83888bb5ad4d9b0141e5c62f8a5138f2 /examples/dbus
parent235ac95520a0fc2c822dedce7358e3c64a764255 (diff)
parent63e88f60a769f2535945db0e1cabb9815ff45a77 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: src/widgets/styles/qstyle_p.h Change-Id: I0e6e856bd6628da1135b3ba674dddffabbeb5c09
Diffstat (limited to 'examples/dbus')
0 files changed, 0 insertions, 0 deletions