add qt5speech, fix plugin installation, fix dlls paths in cmake

5 files changed, 42 insertions, 4 deletions

diff --git a/ports/qt5base/fixcmake.py b/ports/qt5base/fixcmake.py
index d55ca7754..923e600bc 100644
--- a/ports/qt5base/fixcmake.py
+++ b/ports/qt5base/fixcmake.py
@@ -10,8 +10,15 @@ for f in files:
     dllpattern = re.compile("_install_prefix}/bin/Qt5.*d.dll")
     libpattern = re.compile("_install_prefix}/lib/Qt5.*d.lib")
     exepattern = re.compile("_install_prefix}/bin/[a-z]+.exe")
+    tooldllpattern = re.compile("_install_prefix}/tools/qt5/Qt5.*d.dll")
     for line in openedfile:
-        if "_install_prefix}/bin/${LIB_LOCATION}" in line:
+        if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line:
+            builder += "    if (${Configuration} STREQUAL \"RELEASE\")"
+            builder += "\n    " + line.replace("/tools/qt5/", "/bin/")
+            builder += "    else()"
+            builder += "\n    " + line.replace("/tools/qt5/", "/debug/bin/")
+            builder += "    endif()\n"
+        elif "_install_prefix}/bin/${LIB_LOCATION}" in line:
             builder += "    if (${Configuration} STREQUAL \"RELEASE\")"
             builder += "\n    " + line
             builder += "    else()"
@@ -39,6 +46,8 @@ for f in files:
             builder += line.replace("/bin/", "/debug/bin/")
         elif libpattern.search(line) != None:
             builder += line.replace("/lib/", "/debug/lib/")
+        elif tooldllpattern.search(line) != None:
+            builder += line.replace("/tools/qt5/", "/debug/bin/")
         elif exepattern.search(line) != None:
             builder += line.replace("/bin/", "/tools/qt5/")
         else:
diff --git a/ports/qt5declarative/fixcmake.py b/ports/qt5declarative/fixcmake.py
index d55ca7754..923e600bc 100644
--- a/ports/qt5declarative/fixcmake.py
+++ b/ports/qt5declarative/fixcmake.py
@@ -10,8 +10,15 @@ for f in files:
     dllpattern = re.compile("_install_prefix}/bin/Qt5.*d.dll")
     libpattern = re.compile("_install_prefix}/lib/Qt5.*d.lib")
     exepattern = re.compile("_install_prefix}/bin/[a-z]+.exe")
+    tooldllpattern = re.compile("_install_prefix}/tools/qt5/Qt5.*d.dll")
     for line in openedfile:
-        if "_install_prefix}/bin/${LIB_LOCATION}" in line:
+        if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line:
+            builder += "    if (${Configuration} STREQUAL \"RELEASE\")"
+            builder += "\n    " + line.replace("/tools/qt5/", "/bin/")
+            builder += "    else()"
+            builder += "\n    " + line.replace("/tools/qt5/", "/debug/bin/")
+            builder += "    endif()\n"
+        elif "_install_prefix}/bin/${LIB_LOCATION}" in line:
             builder += "    if (${Configuration} STREQUAL \"RELEASE\")"
             builder += "\n    " + line
             builder += "    else()"
@@ -39,6 +46,8 @@ for f in files:
             builder += line.replace("/bin/", "/debug/bin/")
         elif libpattern.search(line) != None:
             builder += line.replace("/lib/", "/debug/lib/")
+        elif tooldllpattern.search(line) != None:
+            builder += line.replace("/tools/qt5/", "/debug/bin/")
         elif exepattern.search(line) != None:
             builder += line.replace("/bin/", "/tools/qt5/")
         else:
diff --git a/ports/qt5declarative/portfile.cmake b/ports/qt5declarative/portfile.cmake
index 48ab900ce..614eecd37 100644
--- a/ports/qt5declarative/portfile.cmake
+++ b/ports/qt5declarative/portfile.cmake
@@ -67,11 +67,13 @@ file(REMOVE ${BINARY_TOOLS})
 
 file(INSTALL ${DEBUG_DIR}/bin DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
 file(INSTALL ${DEBUG_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
+file(INSTALL ${DEBUG_DIR}/plugins DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
 file(INSTALL ${DEBUG_DIR}/include DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5/debug)
 file(INSTALL ${DEBUG_DIR}/mkspecs DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5/debug)
 
 file(INSTALL ${RELEASE_DIR}/bin DESTINATION ${CURRENT_PACKAGES_DIR})
 file(INSTALL ${RELEASE_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR})
+file(INSTALL ${RELEASE_DIR}/plugins DESTINATION ${CURRENT_PACKAGES_DIR})
 file(INSTALL ${RELEASE_DIR}/include DESTINATION ${CURRENT_PACKAGES_DIR})
 file(INSTALL ${RELEASE_DIR}/mkspecs DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5)
 
diff --git a/ports/qt5tools/fixcmake.py b/ports/qt5tools/fixcmake.py
index d55ca7754..923e600bc 100644
--- a/ports/qt5tools/fixcmake.py
+++ b/ports/qt5tools/fixcmake.py
@@ -10,8 +10,15 @@ for f in files:
     dllpattern = re.compile("_install_prefix}/bin/Qt5.*d.dll")
     libpattern = re.compile("_install_prefix}/lib/Qt5.*d.lib")
     exepattern = re.compile("_install_prefix}/bin/[a-z]+.exe")
+    tooldllpattern = re.compile("_install_prefix}/tools/qt5/Qt5.*d.dll")
     for line in openedfile:
-        if "_install_prefix}/bin/${LIB_LOCATION}" in line:
+        if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line:
+            builder += "    if (${Configuration} STREQUAL \"RELEASE\")"
+            builder += "\n    " + line.replace("/tools/qt5/", "/bin/")
+            builder += "    else()"
+            builder += "\n    " + line.replace("/tools/qt5/", "/debug/bin/")
+            builder += "    endif()\n"
+        elif "_install_prefix}/bin/${LIB_LOCATION}" in line:
             builder += "    if (${Configuration} STREQUAL \"RELEASE\")"
             builder += "\n    " + line
             builder += "    else()"
@@ -39,6 +46,8 @@ for f in files:
             builder += line.replace("/bin/", "/debug/bin/")
         elif libpattern.search(line) != None:
             builder += line.replace("/lib/", "/debug/lib/")
+        elif tooldllpattern.search(line) != None:
+            builder += line.replace("/tools/qt5/", "/debug/bin/")
         elif exepattern.search(line) != None:
             builder += line.replace("/bin/", "/tools/qt5/")
         else:
diff --git a/ports/qt5winextras/fixcmake.py b/ports/qt5winextras/fixcmake.py
index d55ca7754..923e600bc 100644
--- a/ports/qt5winextras/fixcmake.py
+++ b/ports/qt5winextras/fixcmake.py
@@ -10,8 +10,15 @@ for f in files:
     dllpattern = re.compile("_install_prefix}/bin/Qt5.*d.dll")
     libpattern = re.compile("_install_prefix}/lib/Qt5.*d.lib")
     exepattern = re.compile("_install_prefix}/bin/[a-z]+.exe")
+    tooldllpattern = re.compile("_install_prefix}/tools/qt5/Qt5.*d.dll")
     for line in openedfile:
-        if "_install_prefix}/bin/${LIB_LOCATION}" in line:
+        if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line:
+            builder += "    if (${Configuration} STREQUAL \"RELEASE\")"
+            builder += "\n    " + line.replace("/tools/qt5/", "/bin/")
+            builder += "    else()"
+            builder += "\n    " + line.replace("/tools/qt5/", "/debug/bin/")
+            builder += "    endif()\n"
+        elif "_install_prefix}/bin/${LIB_LOCATION}" in line:
             builder += "    if (${Configuration} STREQUAL \"RELEASE\")"
             builder += "\n    " + line
             builder += "    else()"
@@ -39,6 +46,8 @@ for f in files:
             builder += line.replace("/bin/", "/debug/bin/")
         elif libpattern.search(line) != None:
             builder += line.replace("/lib/", "/debug/lib/")
+        elif tooldllpattern.search(line) != None:
+            builder += line.replace("/tools/qt5/", "/debug/bin/")
         elif exepattern.search(line) != None:
             builder += line.replace("/bin/", "/tools/qt5/")
         else: