summaryrefslogtreecommitdiffstats
path: root/src/core/javascript_dialog_manager_qt.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-06-29 09:27:09 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-06-29 09:27:09 +0200
commitbdeb49e55617ce42fd7d93075badec5f147bedf8 (patch)
treedb1089078d3b15495d041c2ab3dddc9f81d30d44 /src/core/javascript_dialog_manager_qt.h
parent4bdccc8abcd7ab3a80c0d84fd005452d5ffceb6b (diff)
parent1a26c0ace958c3604c8a751134429dd38168a1a1 (diff)
Merge remote-tracking branch 'origin/5.15' into devHEADdev
Conflicts: src/src.pro Change-Id: I03c260ba676296f93d8137e79b46f3978f5f41ef
Diffstat (limited to 'src/core/javascript_dialog_manager_qt.h')
0 files changed, 0 insertions, 0 deletions