diff options
| author | Markus Goetz <markus@woboq.com> | 2014-10-09 18:49:36 +0400 |
|---|---|---|
| committer | Markus Goetz <markus@woboq.com> | 2014-10-09 18:50:03 +0400 |
| commit | f0fef4f23242f101911305641454dcbb5d3e6424 (patch) | |
| tree | a5d4d28fb3f7cefee26c86cf90df67e005276d3d /admin/osx/macdeployqt.py | |
| parent | 7eb10a08b8b465012d7934a8cb0b39dbf2f028b9 (diff) | |
OS X: Fix .app creation for non-system Qt
Diffstat (limited to 'admin/osx/macdeployqt.py')
| -rwxr-xr-x | admin/osx/macdeployqt.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py index 02b3dfe30..278c666ad 100755 --- a/admin/osx/macdeployqt.py +++ b/admin/osx/macdeployqt.py @@ -23,7 +23,7 @@ import sys from glob import glob def QueryQMake(attrib): - return subprocess.check_output(['qmake', '-query', attrib]).rstrip('\n') + return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n') FRAMEWORK_SEARCH_PATH=[ '/Library/Frameworks', @@ -71,14 +71,15 @@ class CouldNotFindScriptPluginError(Error): class CouldNotFindFrameworkError(Error): pass -if len(sys.argv) < 2: - print 'Usage: %s <bundle.app>' % sys.argv[0] +if len(sys.argv) < 3: + print 'Usage: %s <bundle.app> <path-to-qmake>' % sys.argv[0] exit() def is_exe(fpath): return os.path.isfile(fpath) and os.access(fpath, os.X_OK) bundle_dir = sys.argv[1] +qmake_path = sys.argv[2] bundle_name = os.path.basename(bundle_dir).split('.')[0] |