diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 11:27:24 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 12:22:23 +0000 |
| commit | 42623ee69c62372afad8c11135f44bb4f6bc0cfd (patch) | |
| tree | 564ca782d03f41b7c7d88f0de941ef31bd34a4c1 /src/webenginewidgets/doc/snippets/qtwebengine_qwebenginepage_snippet.cpp | |
| parent | 807adfeec9f9dadb651e401b7dd69eeccda4dd7a (diff) | |
| download | qtwebengine-42623ee69c62372afad8c11135f44bb4f6bc0cfd.tar.gz | |
fix logical mismerge from 5.6
iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7.
Change-Id: I0be78eb67b9f9867548108235eb180874f66cb95
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginewidgets/doc/snippets/qtwebengine_qwebenginepage_snippet.cpp')
0 files changed, 0 insertions, 0 deletions