Skip to content

Commit

Permalink
Revert "removed icu from qt libs to save space"
Browse files Browse the repository at this point in the history
This reverts commit fffe2f0.

(cherry picked from commit c7c32d3)
  • Loading branch information
pstorz authored and arogge committed Jan 22, 2020
1 parent 0ee566d commit 4a900b8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
8 changes: 5 additions & 3 deletions core/platforms/win32/winbareos-nsi.spec
Expand Up @@ -70,9 +70,8 @@ BuildRequires: mingw64-libwinpthread1
BuildRequires: mingw32-libqt5-qtbase
BuildRequires: mingw64-libqt5-qtbase

# needs to be added if qt is built with icu support
#BuildRequires: mingw32-icu
#BuildRequires: mingw64-icu
BuildRequires: mingw32-icu
BuildRequires: mingw64-icu


BuildRequires: mingw32-lzo
Expand Down Expand Up @@ -180,6 +179,9 @@ for flavor in %{flavors}; do
Qt5Core.dll \
Qt5Gui.dll \
Qt5Widgets.dll \
icui18n56.dll \
icudata56.dll \
icuuc56.dll \
libfreetype-6.dll \
libglib-2.0-0.dll \
libintl-8.dll \
Expand Down
18 changes: 6 additions & 12 deletions core/platforms/win32/winbareos.nsi
Expand Up @@ -941,12 +941,9 @@ SectionIn 1 2 3
File "Qt5Core.dll"
File "Qt5Gui.dll"
File "Qt5Widgets.dll"

# needs to be added if qt is built with icu support
# File "icui18n56.dll"
# File "icudata56.dll"
# File "icuuc56.dll"

File "icui18n56.dll"
File "icudata56.dll"
File "icuuc56.dll"
File "libfreetype-6.dll"
File "libglib-2.0-0.dll"
File "libintl-8.dll"
Expand Down Expand Up @@ -2176,12 +2173,9 @@ ConfDeleteSkip:
Delete "$INSTDIR\Qt5Core.dll"
Delete "$INSTDIR\Qt5Gui.dll"
Delete "$INSTDIR\Qt5Widgets.dll"

# needs to be added if qt is built with icu support
# Delete "$INSTDIR\icui18n56.dll"
# Delete "$INSTDIR\icudata56.dll"
# Delete "$INSTDIR\icuuc56.dll"

Delete "$INSTDIR\icui18n56.dll"
Delete "$INSTDIR\icudata56.dll"
Delete "$INSTDIR\icuuc56.dll"
Delete "$INSTDIR\libfreetype-6.dll"
Delete "$INSTDIR\libglib-2.0-0.dll"
Delete "$INSTDIR\libintl-8.dll"
Expand Down

0 comments on commit 4a900b8

Please sign in to comment.