[Libreoffice-commits] core.git: vcl/unx

Julien Nabet serval2412 at yahoo.fr
Sat Jul 11 03:45:33 PDT 2015


 vcl/unx/kde/salnativewidgets-kde.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 238575424341dedaef9713fcdb988ed39ccbf82c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jul 11 12:43:52 2015 +0200

    Blind fix for kde
    
    /home/tinderbox/master/vcl/unx/kde/salnativewidgets-kde.cxx:1987:88: error: implicit instantiation of undefined template ´boost::optional<Color>´
    aStyleSettings.SetMenuBarTextColor( aStyleSettings.GetPersonaMenuBarTextColor().get_value_or( aMenuFore ) );
    
    /home/tinderbox/master/include/vcl/settings.hxx:38:32: note: template is declared here
    template<typename T> class optional;
    
    Change-Id: Ic681d36f376f7433dae56fc1da5f8a2dd0f597ea

diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 6ee5600..08102ba 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -35,6 +35,8 @@
 
 #include <config_vclplug.h>
 
+#include <boost/optional.hpp>
+
 #if ENABLE_TDE
 #define QPushButton_String      "TQPushButton"
 #define QRadioButton_String     "TQRadioButton"


More information about the Libreoffice-commits mailing list