From 5b4b226186c8d23f3a33a0e86eb3f26e17d34981 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 19 Feb 2017 14:02:40 +0100 Subject: [PATCH] Add Qt library/data paths to version info --- qutebrowser/utils/version.py | 7 ++++++- tests/unit/utils/test_version.py | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 729ba440b..784c68cff 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -28,7 +28,8 @@ import subprocess import importlib import collections -from PyQt5.QtCore import QT_VERSION_STR, PYQT_VERSION_STR, qVersion +from PyQt5.QtCore import (QT_VERSION_STR, PYQT_VERSION_STR, qVersion, + QLibraryInfo) from PyQt5.QtNetwork import QSslSocket from PyQt5.QtWidgets import QApplication @@ -278,6 +279,10 @@ def version(): platform.architecture()[0]), 'Frozen: {}'.format(hasattr(sys, 'frozen')), "Imported from {}".format(importpath), + "Qt library executable path: {}, data path: {}".format( + QLibraryInfo.location(QLibraryInfo.LibraryExecutablesPath), + QLibraryInfo.location(QLibraryInfo.DataPath) + ) ] lines += _os_info() diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index ca31c7a12..7b821bba6 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -676,6 +676,7 @@ def test_version_output(git_commit, frozen, style, equal_qt, with_webkit, else usertypes.Backend.QtWebEngine), 'qtutils.is_qtwebkit_ng': (lambda v: True if with_webkit == 'ng' else False), + 'QLibraryInfo.location': (lambda _loc: 'QT PATH') } for attr, val in patches.items(): @@ -703,6 +704,7 @@ def test_version_output(git_commit, frozen, style, equal_qt, with_webkit, Platform: PLATFORM, ARCHITECTURE Frozen: {frozen} Imported from {import_path} + Qt library executable path: QT PATH, data path: QT PATH OS INFO 1 OS INFO 2