Skip to content

Fix qmlimportscanner location #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MasterMind2k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix qmlimportscanner location #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion mxedeployqt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ def main():

parser.add_argument("--mxepath",
help="Path to mxe installation. (Default: /opt/mxe)")
parser.add_argument("--mxehost",
help="Mxe host to use. (Default: x86_64-pc-linux-gnu)")
parser.add_argument("--mxetarget",
help="Mxe target to use. (Default: i686-w64-mingw32.shared)")
parser.add_argument("--qtplugins",
Expand Down Expand Up @@ -212,6 +214,10 @@ def main():
if not mxe_target:
mxe_target = "i686-w64-mingw32.shared"

mxe_host = args.mxehost
if not mxe_host:
mxe_host = "x86_64-pc-linux-gnu"

qt_plugins = args.qtplugins
if qt_plugins:
qt_plugins = [p for p in qt_plugins.split(";") if len(p) > 0]
Expand Down Expand Up @@ -245,11 +251,12 @@ def main():

mxe_files = find_files(mxe_path)
mxe_target_files = [f for f in mxe_files if f.find(mxe_target) != -1]
mxe_host_files = [f for f in mxe_files if f.find(mxe_host) != -1]
mxe_dlls = [f for f in mxe_target_files if f.lower().endswith(".dll")]

objdump = next(iter([f for f in mxe_target_files if f.endswith("objdump")]), None)
qmake = next(iter([f for f in mxe_target_files if f.endswith("qmake-qt5") or os.path.basename(f) == "qmake"]), None)
qmlimportscanner = next(iter([f for f in mxe_target_files if f.endswith("qmlimportscanner")]), None)
qmlimportscanner = next(iter([f for f in mxe_target_files + mxe_host_files if f.endswith("qmlimportscanner")]), None)

error = None

Expand Down