diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-27 10:03:12 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-27 10:03:43 +0200 |
| commit | 10e66c6dd0b8a8dd17252d6408c13b689fac6995 (patch) | |
| tree | fbdddb33a818b5495b24f3949f7406b0b916e78c /src/core/profile_qt.cpp | |
| parent | d0852f90a24673ccc9ef0b93e224ba37b674644d (diff) | |
| parent | 75412200db05ddc5ee2b9aea367b580d8b0c438e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
configure.pri
src/pdf/api/qpdfpagerenderer.h
Change-Id: I7e68277080e29238bbfe8511539ea75b2db89489
Diffstat (limited to 'src/core/profile_qt.cpp')
| -rw-r--r-- | src/core/profile_qt.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/profile_qt.cpp b/src/core/profile_qt.cpp index 3d3baa0d7..748104312 100644 --- a/src/core/profile_qt.cpp +++ b/src/core/profile_qt.cpp @@ -41,7 +41,6 @@ #include "profile_adapter.h" #include "browsing_data_remover_delegate_qt.h" -#include "command_line_pref_store_qt.h" #include "download_manager_delegate_qt.h" #include "net/ssl_host_state_delegate_qt.h" #include "permission_manager_qt.h" |