summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-05-09 13:36:18 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-10 04:17:03 +0000
commitec63ae9ad964bffd0e88a5f55dd6e6d52fea179c (patch)
tree0cc7b62f4cc9a4e5546233c7e212d344647f06ea /src
parent7be0546cc040dc1b9d2dbb0bb0614bfcccb3e6bb (diff)
Fix quicknanobrowser
Fix conflict between two Settings classes. Required to launch example. Change-Id: I9b98e0b79f84f905f92a7042f2bf7aab4a34d225 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions