Fix deployment of Qt libs (debug vs release) on windows.

Change-Id: If359d56bf325d24a4e127c385a3925a5e8ee6701
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/scripts/deployqt.py b/scripts/deployqt.py
index 9b30f7de71..d3848930fc 100755
--- a/scripts/deployqt.py
+++ b/scripts/deployqt.py
@@ -65,11 +65,14 @@ def which(program):
     return None
 
 def is_debug(fpath):
+    # match all Qt Core dlls from Qt4, Qt5beta2 and Qt5rc1 and later
+    # which all have the number at different places
+    coredebug = re.compile(r'Qt[1-9]?Core[1-9]?d[1-9]?.dll')
     # bootstrap exception
-    if fpath.endswith('QtCore4d.dll') or fpath.endswith('QtCore5d.dll'):
+    if re.search(fpath):
         return True
     output = subprocess.check_output(['dumpbin', '/imports', fpath])
-    return output.find('QtCore4d.dll') != -1 or output.find('QtCore5d.dll') != -1
+    return re.search(output)
 
 def is_debug_build(install_dir):
     return is_debug(os.path.join(install_dir, 'bin', 'qtcreator.exe'))