rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Qt library/data paths to version info

Browse Source
This commit is contained in:
Florian Bruhin 2017-02-19 14:02:40 +01:00
parent 01db59ff36
commit 5b4b226186
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qutebrowser/utils/version.py
View File

@ -28,7 +28,8 @@ import subprocess
import importlib import importlib
import collections 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.QtNetwork import QSslSocket
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
@ -278,6 +279,10 @@ def version():
platform.architecture()[0]), platform.architecture()[0]),
'Frozen: {}'.format(hasattr(sys, 'frozen')), 'Frozen: {}'.format(hasattr(sys, 'frozen')),
"Imported from {}".format(importpath), "Imported from {}".format(importpath),
"Qt library executable path: {}, data path: {}".format(
QLibraryInfo.location(QLibraryInfo.LibraryExecutablesPath),
QLibraryInfo.location(QLibraryInfo.DataPath)
)
] ]
lines += _os_info() lines += _os_info()

2
tests/unit/utils/test_version.py
View File

@ -676,6 +676,7 @@ def test_version_output(git_commit, frozen, style, equal_qt, with_webkit,
else usertypes.Backend.QtWebEngine), else usertypes.Backend.QtWebEngine),
'qtutils.is_qtwebkit_ng': (lambda v: 'qtutils.is_qtwebkit_ng': (lambda v:
True if with_webkit == 'ng' else False), True if with_webkit == 'ng' else False),
'QLibraryInfo.location': (lambda _loc: 'QT PATH')
} }
for attr, val in patches.items(): 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 Platform: PLATFORM, ARCHITECTURE
Frozen: {frozen} Frozen: {frozen}
Imported from {import_path} Imported from {import_path}
Qt library executable path: QT PATH, data path: QT PATH
OS INFO 1 OS INFO 1
OS INFO 2 OS INFO 2