diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2019-05-23 16:41:14 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2019-05-24 03:07:15 +0200 |
| commit | 6c817f00dbcdf4e38bf22741111fb49fb6815671 (patch) | |
| tree | b8e960d33b966f5983d2aa236f2f8dd0fc0791d6 /shell | |
| parent | 6d7a32ffd1bd1530ac9bf38d10c89fe7cd598f87 (diff) | |
qt5: Fix build
The utility constructor using 'StockImage::Yes' was only introduced
in master commit 0f104bf33530467380044b9eb4cd3f8bd9c283f1 and is
therefore not available in libreoffice-6-2 branch.
Build was therefore broken by commit
f10c1c648e698b48dfaa679a4909b3d9de6ed868 ("tdf#123549 Qt5 implement
Qt5Menu::ShowCloseButton"), which first went unnoticed since
qt5/kde5 wasn't enabled for CI builds on branch libreoffice-6-2.
(This will be changed by
https://gerrit.libreoffice.org/#/c/72741/ .)
Also, add a missing include that lead to kde5-enabled CI builds
failing [1], which I couldn't reproduce locally
("shell/source/backends/kde5be/kde5backend.cxx:190:5: error:
‘unique_ptr’ is not a member of ‘std’").
And fix more issues showing up in [2] and follow-up builds
of the change that enables kde5 on the 6.2 branch [3].
[1] https://ci.libreoffice.org/job/gerrit_62/1535/
[2] https://ci.libreoffice.org/job/gerrit_62/1540/
[3] https://gerrit.libreoffice.org/#/c/72741/
Change-Id: I6a39a99114d15808b790242c96d0204916a0cc40
Reviewed-on: https://gerrit.libreoffice.org/72779
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/kde5be/kde5backend.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shell/source/backends/kde5be/kde5backend.cxx b/shell/source/backends/kde5be/kde5backend.cxx index 101a21387a4c..9c765775d0a9 100644 --- a/shell/source/backends/kde5be/kde5backend.cxx +++ b/shell/source/backends/kde5be/kde5backend.cxx @@ -19,6 +19,8 @@ #include <sal/config.h> +#include <memory> + #include <QtWidgets/QApplication> #include <boost/noncopyable.hpp> |