[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/Library_cui.mk cui/source

László Németh laszlo.nemeth at collabora.com
Wed Aug 26 07:34:21 PDT 2015


 cui/Library_cui.mk           |    1 +
 cui/source/dialogs/about.cxx |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit 6f878a6964656683b0ea4cf43691b3fb7e28bdfd
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Wed Aug 26 12:25:14 2015 +0200

    tdf#93620: show OpenGL status in Help->About
    
    Build ID will show enabled OpenGL with an extra string "-GL"
    helping the fix of rendering issues.
    
    Change-Id: Id7bf2db2edb165542bf7a2a253c698c494278a03
    Reviewed-on: https://gerrit.libreoffice.org/18014
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 833af3c..64f75aa 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_externals,cui,\
 	boost_headers \
     icuuc \
     icu_headers \
+    glew \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 630dd30..e5732b2 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -48,6 +48,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <vcl/bitmap.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <vcl/opengl/OpenGLHelper.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -296,6 +297,11 @@ OUString AboutDialog::GetVersionString()
         sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId);
     }
 
+    if (OpenGLHelper::isVCLOpenGLEnabled())
+    {
+        sVersion += "-GL";
+    }
+
     if (EXTRA_BUILDID[0] != '\0')
     {
         sVersion += "\n" EXTRA_BUILDID;


More information about the Libreoffice-commits mailing list