diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-03-14 17:28:02 +0100 |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-03-14 17:41:32 +0100 |
| commit | 23e0d86f0442c234dfbc87075684e75a81f57812 (patch) | |
| tree | 3e22de85b1063521153f79627c0fd5b460620567 /scripts | |
| parent | 5b6b7688580861313a3e17ef14c07527faa054f6 (diff) | |
| download | qt-creator-23e0d86f0442c234dfbc87075684e75a81f57812.tar.gz | |
deployqt: copy Qt libs from bin/, not lib/ on Windows.
Change-Id: I967dbfa89dd192ef47ee14dd15ed702c66f263c5
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index cf1b008e05..e4c1078f5d 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -245,6 +245,7 @@ def main(): sys.exit(2) QT_INSTALL_LIBS = readQmakeVar(qmake_bin, 'QT_INSTALL_LIBS') + QT_INSTALL_BINS = readQmakeVar(qmake_bin, 'QT_INSTALL_BINS') QT_INSTALL_PLUGINS = readQmakeVar(qmake_bin, 'QT_INSTALL_PLUGINS') QT_INSTALL_IMPORTS = readQmakeVar(qmake_bin, 'QT_INSTALL_IMPORTS') QT_INSTALL_TRANSLATIONS = readQmakeVar(qmake_bin, 'QT_INSTALL_TRANSLATIONS') @@ -257,7 +258,10 @@ def main(): global debug_build debug_build = is_debug_build(install_dir) - copy_qt_libs(install_dir, QT_INSTALL_LIBS, QT_INSTALL_PLUGINS, QT_INSTALL_IMPORTS, plugins, imports) + if sys.platform.startswith('win'): + copy_qt_libs(install_dir, QT_INSTALL_BINS, QT_INSTALL_PLUGINS, QT_INSTALL_IMPORTS, plugins, imports) + else: + copy_qt_libs(install_dir, QT_INSTALL_LIBS, QT_INSTALL_PLUGINS, QT_INSTALL_IMPORTS, plugins, imports) copy_translations(install_dir, QT_INSTALL_TRANSLATIONS, tr_catalogs) if not sys.platform.startswith('win'): |