diff options
| author | Jose Tiago Macara Coutinho <coutinhotiago@gmail.com> | 2019-07-19 13:12:03 +0200 |
|---|---|---|
| committer | Jose Tiago Macara Coutinho <coutinhotiago@gmail.com> | 2019-07-19 13:14:32 +0200 |
| commit | de702e3a51313663f5780e2df57f564953df32e8 (patch) | |
| tree | d6fc6e4d6e12eb7615438e0f14dc9c2e97ef253a /lib/taurus/qt/qtdesigner | |
| parent | c3b0a07ecc5f7c393b7ee32e11a7264f55a89526 (diff) | |
Fix case when Qt provides good binaries path on windows
Diffstat (limited to 'lib/taurus/qt/qtdesigner')
| -rw-r--r-- | lib/taurus/qt/qtdesigner/taurusdesigner.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/taurus/qt/qtdesigner/taurusdesigner.py b/lib/taurus/qt/qtdesigner/taurusdesigner.py index d6008371..d8552a26 100644 --- a/lib/taurus/qt/qtdesigner/taurusdesigner.py +++ b/lib/taurus/qt/qtdesigner/taurusdesigner.py @@ -86,10 +86,11 @@ def get_qtdesigner_bin(): designer_bin, "Designer.app", "Contents", "MacOS", "designer") elif plat in ("win32", "nt"): designer_bin = os.path.join(designer_bin, "designer.exe") - if os.path.exists(designer_bin): - designer_bin = os.path.join(designer_bin, "designer") - else: - designer_bin = subprocess.check_output('where designer').decode().strip() + if not os.path.exists(designer_bin): + # some installations don't properly install designer + # in QLibraryInfo.BinariesPath. We do a best effort to find it + designer_bin = subprocess.check_output('where designer') + designer_bin = designer_bin.decode().strip() else: designer_bin = os.path.join(designer_bin, "designer") return designer_bin |