Fix qt plugin install path

* src/inst-qtbase.nsi, src/inst-qtsvg.nsi: Install plugins in bin.
* src/uninst-qtbase.nsi, src/uninst-qtsvg.nsi: Update accordingly.

diff --git a/src/inst-qtbase.nsi b/src/inst-qtbase.nsi
index 301a638..debd4c9 100644 (file)
--- a/src/inst-qtbase.nsi
+++ b/src/inst-qtbase.nsi
@@ -41,7 +41,7 @@ Section "-qtbase" SEC_qtbase
   File ${prefix}/bin/Qt5PrintSupport.dll
   File ${prefix}/bin/Qt5Xml.dll
 
-  SetOutPath "$INSTDIR\platforms"
+  SetOutPath "$INSTDIR\bin\platforms"
 
   File ${prefix}/plugins/platforms/qwindows.dll
 

diff --git a/src/inst-qtsvg.nsi b/src/inst-qtsvg.nsi
index 45e6aa8..6ba14a2 100644 (file)
--- a/src/inst-qtsvg.nsi
+++ b/src/inst-qtsvg.nsi
@@ -31,9 +31,9 @@ Section "-qtsvg" SEC_qtsvg
 !else
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/Qt5Svg.dll
-  SetOutPath "$INSTDIR\iconengines"
-  File ${prefix}/plugins/iconengines/qtsvgicon.dll
-  SetOutPath "$INSTDIR\imageformats"
-  File ${prefix}/plugins/imageformats/qtsvg.dll
+  SetOutPath "$INSTDIR\bin\iconengines"
+  File ${prefix}/plugins/iconengines/qsvgicon.dll
+  SetOutPath "$INSTDIR\bin\imageformats"
+  File ${prefix}/plugins/imageformats/qsvg.dll
 !endif
 SectionEnd

diff --git a/src/uninst-qtbase.nsi b/src/uninst-qtbase.nsi
index eab906f..2a26743 100644 (file)
--- a/src/uninst-qtbase.nsi
+++ b/src/uninst-qtbase.nsi
@@ -38,9 +38,10 @@ Section "-un.qtbase"
   Delete "$INSTDIR\bin\Qt5Xml.dll"
   Delete "$INSTDIR\bin\Qt5PrintSupport.dll"
 
-  Delete "$INSTDIR\platforms\qwindows.dll"
+  Delete "$INSTDIR\bin\platforms\qwindows.dll"
 
-  RMDir "$INSTDIR\platforms"
+  RMDir "$INSTDIR\bin\platforms"
+  RMDir "$INSTDIR\bin"
 
   RMDir "$INSTDIR"
 !endif

diff --git a/src/uninst-qtsvg.nsi b/src/uninst-qtsvg.nsi
index b9326c1..2765db8 100644 (file)
--- a/src/uninst-qtsvg.nsi
+++ b/src/uninst-qtsvg.nsi
@@ -27,8 +27,8 @@ Section "-un.qtsvg"
   Call un.SourceDelete
 !else
   Delete "$INSTDIR\bin\Qt5Svg.dll"
-  Delete "$INSTDIR\bin\iconengines\qtsvgicon.dll"
-  Delete "$INSTDIR\bin\imageformats\qtsvg.dll"
+  Delete "$INSTDIR\bin\iconengines\qsvgicon.dll"
+  Delete "$INSTDIR\bin\imageformats\qsvg.dll"
   RmDir "$INSTDIR\bin\imageformats"
   RmDir "$INSTDIR\bin\iconengines"
   RmDir "$INSTDIR\bin"