Fix install problems after update
authorAndre Heinecke <aheinecke@intevation.de>
Wed, 28 Feb 2018 11:01:58 +0000 (12:01 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Wed, 28 Feb 2018 11:01:58 +0000 (12:01 +0100)
* src/inst-qtbase.nsi, src/uninst-qtbase.nsi: Vista style is
now a plugin.
* src/makeportable-full.h: Update.

src/inst-qtbase.nsi
src/mkportable-full.h
src/uninst-qtbase.nsi

index c6e2268..17484d1 100644 (file)
@@ -55,5 +55,8 @@ Section "-qtbase" SEC_qtbase
   SetOutPath "$INSTDIR\bin\printsupport"
   File ${prefix}/plugins/printsupport/windowsprintersupport.dll
 
+  SetOutPath "$INSTDIR\bin\styles"
+  File ${prefix}/plugins/styles/qwindowsvistastyle.dll
+
 !endif
 SectionEnd
index 347c95a..4484cff 100644 (file)
@@ -134,6 +134,7 @@ const char * const full_files[] =
   "bin/libwinpthread-1.dll",
   "bin/libKF5Mime.dll",
   "bin/platforms/qwindows.dll",
+  "bin/styles/qwindowsvistastyle.dll",
   "bin/gspawn-win32-helper-console.exe",
   "bin/sha1sum.exe",
   "bin/libassuan-0.dll",
@@ -344,8 +345,8 @@ const char * const full_files[] =
   "share/icons/breeze/status/64/dialog-warning.svg",
   "share/icons/breeze/status/64/security-low.svg",
   "share/icons/breeze/categories/32/applications-graphics.svg",
-  "share/icons/breeze/apps/32/preferences-desktop-locale.svg",
-  "share/icons/breeze/apps/32/preferences-system-network.svg",
+  "share/icons/breeze/preferences/32/preferences-desktop-locale.svg",
+  "share/icons/breeze/preferences/32/preferences-system-network.svg",
   "share/icons/breeze/apps/22/kde.svg",
   "share/icons/breeze/apps/48/internet-mail.svg",
   "share/icons/breeze/apps/48/telepathy-kde.svg",
index 7d82f3b..a1fcbba 100644 (file)
@@ -41,9 +41,11 @@ Section "-un.qtbase"
 
   Delete "$INSTDIR\bin\platforms\qwindows.dll"
   Delete "$INSTDIR\bin\printsupport\windowsprintersupport.dll"
+  Delete "$INSTDIR\bin\styles\qwindowsvistastyle.dll"
 
   RMDir "$INSTDIR\bin\printsupport"
   RMDir "$INSTDIR\bin\platforms"
+  RMDir "$INSTDIR\bin\styles"
   RMDir "$INSTDIR\bin"
 
   RMDir "$INSTDIR"