From 5dcb6c4f3821381d490ef2442cbbc57401367440 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 10 Jun 2014 22:59:14 +0200
Subject: [PATCH] Improve version output

---
 TODO                         |  1 -
 qutebrowser/utils/version.py | 15 ++++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TODO b/TODO
index 2fcfbf133..5f00df99c 100644
--- a/TODO
+++ b/TODO
@@ -42,7 +42,6 @@ Improvements / minor features
 - Improve error pages (print error domain/code/...)
 - Print nicer error message when platform plugin is missing
   (on Arch: libxkbcommon-x11)
-- Add harfbuzz forcing to version info
 - Print some meaningful message (via qInstallMsgHandler) when platform plugins
   are missing, especially with xcb (on Arch: libxkbcommon-x11)
 - Reimplement tabbar to paint it by ourselves to look like dwb
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 4645bb9a6..ecbd602b0 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -141,10 +141,10 @@ def _module_versions():
         pass
     else:
         try:
-            lines.append('SIP {}'.format(
+            lines.append('SIP: {}'.format(
                 sipconfig.Configuration().sip_version_str))
         except (AttributeError, TypeError):
-            lines.append('SIP ?')
+            lines.append('SIP: ?')
 
     try:
         import ipdb
@@ -153,7 +153,7 @@ def _module_versions():
         pass
     else:
         ver = getattr(IPython, '__version__', 'yes')
-        lines.append('ipdb/IPython {}'.format(ver))
+        lines.append('ipdb/IPython: {}'.format(ver))
 
     try:
         import colorlog
@@ -205,14 +205,15 @@ def version():
         lines.append("Git commit: {}".format(gitver))
     lines += [
         '',
-        '{} {}'.format(platform.python_implementation(),
+        '{}: {}'.format(platform.python_implementation(),
                        platform.python_version()),
-        'Qt {}, runtime {}'.format(QT_VERSION_STR, qVersion()),
-        'PyQt {}'.format(PYQT_VERSION_STR),
+        'Qt: {}, runtime: {}'.format(QT_VERSION_STR, qVersion()),
+        'PyQt: {}'.format(PYQT_VERSION_STR),
     ]
     lines += _module_versions()
     lines += [
-        'Webkit {}'.format(qWebKitVersion()),
+        'Webkit: {}'.format(qWebKitVersion()),
+        'Harfbuzz: {}'.format(os.environ.get('QT_HARFBUZZ', 'system')),
         '',
         'Platform: {}, {}'.format(platform.platform(),
                                   platform.architecture()[0]),