Skip to content

Commit

Permalink
macdeployqt: Qt 5.10.1 #5932
Browse files Browse the repository at this point in the history
(cherry picked from commit 20bd943)
  • Loading branch information
guruz committed Mar 27, 2018
1 parent 6e84a8d commit 8da6fc4
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions admin/osx/macdeployqt.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import commands
import sys
from glob import glob
from distutils.version import LooseVersion

def QueryQMake(attrib):
return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
Expand Down Expand Up @@ -92,6 +93,8 @@ def is_exe(fpath):
plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];

qt_version = QueryQMake('QT_VERSION')
print "Using Qt", qt_version

fixed_libraries = []
fixed_frameworks = []
Expand Down Expand Up @@ -334,6 +337,9 @@ def FindQtPlugin(name):
for binary in binaries:
FixBinary(binary)


if LooseVersion(qt_version) >= LooseVersion("5.10.0"):
QT_PLUGINS.append('styles/libqmacstyle.dylib')
for plugin in QT_PLUGINS:
FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))

Expand Down

0 comments on commit 8da6fc4

Please sign in to comment.