summaryrefslogtreecommitdiffstats
path: root/src/core/content_client_qt.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-04-28 08:52:53 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-04-28 08:52:53 +0000
commit59ba09bdb191888ea21aafcf90e576bfb3e7406c (patch)
treedc9b44c1ed5a3d27d5bd6942c4fdb3cc7dc8a276 /src/core/content_client_qt.cpp
parent0cf94ce10d5559ac99b1893abca6ad6bc407528c (diff)
parent658a964cf2593e6da3b1a822124e796bbe354d36 (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/core/content_client_qt.cpp')
0 files changed, 0 insertions, 0 deletions