summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLászló Németh <laszlo.nemeth@collabora.com>2015-08-26 12:25:14 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-08-26 14:33:59 +0000
commit6f878a6964656683b0ea4cf43691b3fb7e28bdfd (patch)
tree85c9170660fd03d31f77f230c984d804d5e61a2c
parent350b00af0a1d0bf516ac308e21849ece77acbaf6 (diff)
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@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--cui/Library_cui.mk1
-rw-r--r--cui/source/dialogs/about.cxx6
2 files changed, 7 insertions, 0 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 833af3ccadc8..64f75aa41a70 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 630dd30e9725..e5732b226690 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;