summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-02-27 11:25:29 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-02-27 11:25:29 +0100
commit01d4c6440b52f2ce26ced45b6ad193e909db44af (patch)
treeadf466a63806aa8a9c504642f17a2466a945232a /src/3rdparty
parent2d8d15047fdbf046cdee9fba103587c19808d7d2 (diff)
parentdf5d831bae99662fab43ed2628187113c18aac2c (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts: src/core/renderer_host/web_channel_ipc_transport_host.cpp tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp Change-Id: I47f2b893bc9f27cd9df641f76badc9e53b482ad4
Diffstat (limited to 'src/3rdparty')
m---------src/3rdparty0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 5b79320c01316f29510df90f7c6b508b9f72b8a
+Subproject 12a57d9c943eaa80d87481712fe58f7bf6678ba