Skip to content

Commit 28482ef

Browse files
TheCharlatanTheCharlatan
committed
Ugrade Qt depends to Qt5.9.4
Depends can now be built with Qt5.9.4 , which is Qt's new long term support version.
1 parent 40334c7 commit 28482ef

File tree

7 files changed

+118
-278
lines changed

7 files changed

+118
-278
lines changed

‎build-aux/m4/bitcoin_qt.m4

Lines changed: 95 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -276,35 +276,56 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
276276
#endif
277277
]],
278278
[[
279-
#if QT_VERSION < 0x050000
279+
#if QT_VERSION < 0x050000 || QT_VERSION_MAJOR < 5
280280
choke
281281
#endif
282282
]])],
283283
[bitcoin_cv_qt5=yes],
284284
[bitcoin_cv_qt5=no])
285285
])])
286286
287-
dnl Internal. Check if the linked version of Qt was built as static libs.
288-
dnl Requires: Qt5.
289-
dnl Requires: INCLUDES and LIBS must be populated as necessary.
290-
dnl Output: bitcoin_cv_static_qt=yes|no
291-
dnl Output: Defines QT_STATICPLUGIN if plugins are static.
292-
AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
293-
AC_CACHE_CHECK(for static Qt, bitcoin_cv_static_qt,[
287+
dnl Internal. Check if the included version of Qt is greater than Qt58.
288+
dnl Requires: INCLUDES must be populated as necessary.
289+
dnl Output: bitcoin_cv_qt5=yes|no
290+
AC_DEFUN([_BITCOIN_QT_CHECK_QT58],[
291+
AC_CACHE_CHECK(for > Qt 5.7, bitcoin_cv_qt58,[
294292
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
295293
#include <QtCore/qconfig.h>
296294
#ifndef QT_VERSION
297295
# include <QtCore/qglobal.h>
298296
#endif
299297
]],
300298
[[
301-
#if !defined(QT_STATIC)
299+
#if QT_VERSION_MINOR < 8
302300
choke
303301
#endif
304302
]])],
305-
[bitcoin_cv_static_qt=yes],
306-
[bitcoin_cv_static_qt=no])
307-
])
303+
[bitcoin_cv_qt58=yes],
304+
[bitcoin_cv_qt58=no])
305+
])])
306+
307+
308+
dnl Internal. Check if the linked version of Qt was built as static libs.
309+
dnl Requires: Qt5. This check cannot determine if Qt4 is static.
310+
dnl Requires: INCLUDES and LIBS must be populated as necessary.
311+
dnl Output: bitcoin_cv_static_qt=yes|no
312+
dnl Output: Defines QT_STATICPLUGIN if plugins are static.
313+
AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
314+
AC_CACHE_CHECK(for static Qt, bitcoin_cv_static_qt,[
315+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
316+
#include <QtCore/qconfig.h>
317+
#ifndef QT_VERSION OR QT_VERSION_STR
318+
# include <QtCore/qglobal.h>
319+
#endif
320+
]],
321+
[[
322+
#if !defined(QT_STATIC)
323+
choke
324+
#endif
325+
]])],
326+
[bitcoin_cv_static_qt=yes],
327+
[bitcoin_cv_static_qt=no])
328+
])
308329
if test "x$bitcoin_cv_static_qt" = xyes; then
309330
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static Qt plugins])
310331
fi
@@ -338,39 +359,60 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
338359
if test -d "$qt_plugin_path/accessible"; then
339360
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"
340361
fi
341-
fi
342-
if test "x$use_pkgconfig" = xyes; then
343-
: dnl
344-
m4_ifdef([PKG_CHECK_MODULES],[
345-
PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"])
346-
if test "x$TARGET_OS" = xlinux; then
347-
PKG_CHECK_MODULES([X11XCB], [x11-xcb], [QT_LIBS="$X11XCB_LIBS $QT_LIBS"])
348-
if ${PKG_CONFIG} --exists "Qt5Core >= 5.5" 2>/dev/null; then
349-
PKG_CHECK_MODULES([QTXCBQPA], [Qt5XcbQpa], [QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"])
362+
if test "x$use_pkgconfig" = xyes; then
363+
: dnl
364+
m4_ifdef([PKG_CHECK_MODULES],[
365+
if test x$bitcoin_cv_qt58 = xno; then
366+
PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"])
367+
else
368+
PKG_CHECK_MODULES([QTFONTDATABASE], [Qt5FontDatabaseSupport], [QT_LIBS="-lQt5FontDatabaseSupport $QT_LIBS"])
369+
PKG_CHECK_MODULES([QTEVENTDISPATCHER], [Qt5EventDispatcherSupport], [QT_LIBS="-lQt5EventDispatcherSupport $QT_LIBS"])
370+
PKG_CHECK_MODULES([QTTHEME], [Qt5ThemeSupport], [QT_LIBS="-lQt5ThemeSupport $QT_LIBS"])
371+
PKG_CHECK_MODULES([QTDEVICEDISCOVERY], [Qt5DeviceDiscoverySupport], [QT_LIBS="-lQt5DeviceDiscoverySupport $QT_LIBS"])
372+
PKG_CHECK_MODULES([QTACCESSIBILITY], [Qt5AccessibilitySupport], [QT_LIBS="-lQt5AccessibilitySupport $QT_LIBS"])
373+
PKG_CHECK_MODULES([QTFB], [Qt5FbSupport], [QT_LIBS="-lQt5FbSupport $QT_LIBS"])
374+
fi
375+
if test "x$TARGET_OS" = xlinux; then
376+
PKG_CHECK_MODULES([X11XCB], [x11-xcb], [QT_LIBS="$X11XCB_LIBS $QT_LIBS"])
377+
if ${PKG_CONFIG} --exists "Qt5Core >= 5.5" 2>/dev/null; then
378+
PKG_CHECK_MODULES([QTXCBQPA], [Qt5XcbQpa], [QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"])
379+
fi
380+
elif test "x$TARGET_OS" = xdarwin; then
381+
PKG_CHECK_MODULES([QTCLIPBOARD], [Qt5ClipboardSupport], [QT_LIBS="-lQt5ClipboardSupport $QT_LIBS"])
382+
PKG_CHECK_MODULES([QTGRAPHICS], [Qt5GraphicsSupport], [QT_LIBS="-lQt5GraphicsSupport $QT_LIBS"])
383+
PKG_CHECK_MODULES([QTCGL], [Qt5CglSupport], [QT_LIBS="-lQt5CglSupport $QT_LIBS"])
350384
fi
351-
elif test "x$TARGET_OS" = xdarwin; then
352-
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
353-
fi
354-
])
355-
else
356-
if test "x$TARGET_OS" = xwindows; then
357-
AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[
358-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
359-
#include <QtCore/qconfig.h>
360-
#ifndef QT_VERSION
361-
# include <QtCore/qglobal.h>
362-
#endif
363-
]],
364-
[[
365-
#if QT_VERSION < 0x050600
366-
choke
367-
#endif
368-
]])],
369-
[bitcoin_cv_need_platformsupport=yes],
370-
[bitcoin_cv_need_platformsupport=no])
371-
])
372-
if test "x$bitcoin_cv_need_platformsupport" = xyes; then
373-
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}PlatformSupport not found)))
385+
])
386+
else
387+
if test "x$TARGET_OS" = xwindows; then
388+
AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[
389+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
390+
#include <QtCore/qconfig.h>
391+
#ifndef QT_VERSION
392+
# include <QtCore/qglobal.h>
393+
#endif
394+
]],
395+
[[
396+
#if QT_VERSION < 0x050600 || QT_VERSION_MINOR < 6
397+
choke
398+
#endif
399+
]])],
400+
[bitcoin_cv_need_platformsupport=yes],
401+
[bitcoin_cv_need_platformsupport=no])
402+
])
403+
if test "x$bitcoin_cv_need_platformsupport" = xyes; then
404+
if test x$bitcoin_cv_qt58 = xno; then
405+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXPlatformSupport not found)))
406+
else
407+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}FontDatabaseSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXFontDatabaseSupport not found)))
408+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}EventDispatcherSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXEventDispatcherSupport not found)))
409+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}ThemeSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXThemeSupport not found)))
410+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}FbSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXFbSupport not found)))
411+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}DeviceDiscoverySupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXDeviceDiscoverySupport not found)))
412+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}AccessibilitySupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXAccessibilitySupport not found)))
413+
QT_LIBS="$QT_LIBS -lversion -ldwmapi -luxtheme"
414+
fi
415+
fi
374416
fi
375417
fi
376418
fi
@@ -430,6 +472,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
430472
BITCOIN_QT_CHECK([
431473
if test "x$bitcoin_qt_want_version" = xauto; then
432474
_BITCOIN_QT_CHECK_QT5
475+
_BITCOIN_QT_CHECK_QT58
433476
fi
434477
QT_LIB_PREFIX=Qt5
435478
])
@@ -446,10 +489,15 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
446489
])
447490
448491
BITCOIN_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in])))
449-
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
450492
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in])))
451-
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in])))
452-
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
493+
if test x$bitcoin_cv_qt58 = xno; then
494+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
495+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in])))
496+
else
497+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtlibpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
498+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre2_match_16], [qtpcre2 libqtpcre2],,AC_MSG_WARN([libqtpcre2 not found. Assuming qt has it built-in])))
499+
fi
500+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng qtharfbuzz harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
453501
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Core not found)))
454502
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found)))
455503
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Network not found)))

‎depends/packages/qt.mk

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
PACKAGE=qt
2-
$(package)_version=5.7.1
3-
$(package)_download_path=https://download.qt.io/archive/qt/5.7/$($(package)_version)/submodules
4-
$(package)_suffix=opensource-src-$($(package)_version).tar.gz
2+
$(package)_version=5.9.4
3+
$(package)_download_path=http://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
4+
$(package)_suffix=opensource-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
6+
$(package)_sha256_hash=69e6bde3ab00673a77e1506173551fec7d0cd899fcbf9b1260517db1b61004cf
77
$(package)_dependencies=openssl zlib
88
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
99
$(package)_build_subdir=qtbase
1010
$(package)_qt_libs=corelib network widgets gui plugins testlib
11-
$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
12-
$(package)_patches+=fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
11+
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch qfixed-coretext.patch
1312

1413
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
15-
$(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
16-
14+
$(package)_qttranslations_sha256_hash=e5cf81f88cc6811166ea631e6b7faa869a578a910dce61e951f98ff83f27bad6
1715

1816
$(package)_qttools_file_name=qttools-$($(package)_suffix)
19-
$(package)_qttools_sha256_hash=22d67de915cb8cd93e16fdd38fa006224ad9170bd217c2be1e53045a8dd02f0f
17+
$(package)_qttools_sha256_hash=95aa5782d5a79be22fba36cea4dc2319cf2a2060a3cc1e24e6585b8d98996e87
2018

2119
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2220
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -29,25 +27,18 @@ $(package)_config_opts += -c++std c++11
2927
$(package)_config_opts += -confirm-license
3028
$(package)_config_opts += -dbus-runtime
3129
$(package)_config_opts += -hostprefix $(build_prefix)
32-
$(package)_config_opts += -no-alsa
33-
$(package)_config_opts += -no-audio-backend
3430
$(package)_config_opts += -no-cups
3531
$(package)_config_opts += -no-egl
3632
$(package)_config_opts += -no-eglfs
37-
$(package)_config_opts += -no-feature-style-windowsmobile
38-
$(package)_config_opts += -no-feature-style-windowsce
3933
$(package)_config_opts += -no-freetype
4034
$(package)_config_opts += -no-gif
4135
$(package)_config_opts += -no-glib
42-
$(package)_config_opts += -no-gstreamer
4336
$(package)_config_opts += -no-icu
4437
$(package)_config_opts += -no-iconv
4538
$(package)_config_opts += -no-kms
4639
$(package)_config_opts += -no-linuxfb
4740
$(package)_config_opts += -no-libudev
48-
$(package)_config_opts += -no-mitshm
4941
$(package)_config_opts += -no-mtdev
50-
$(package)_config_opts += -no-pulseaudio
5142
$(package)_config_opts += -no-openvg
5243
$(package)_config_opts += -no-reduce-relocations
5344
$(package)_config_opts += -no-qml-debug
@@ -62,7 +53,6 @@ $(package)_config_opts += -no-sql-sqlite
6253
$(package)_config_opts += -no-sql-sqlite2
6354
$(package)_config_opts += -no-use-gold-linker
6455
$(package)_config_opts += -no-xinput2
65-
$(package)_config_opts += -no-xrender
6656
$(package)_config_opts += -nomake examples
6757
$(package)_config_opts += -nomake tests
6858
$(package)_config_opts += -opensource
@@ -75,12 +65,13 @@ $(package)_config_opts += -qt-libpng
7565
$(package)_config_opts += -qt-libjpeg
7666
$(package)_config_opts += -qt-pcre
7767
$(package)_config_opts += -system-zlib
78-
$(package)_config_opts += -reduce-exports
7968
$(package)_config_opts += -static
8069
$(package)_config_opts += -silent
8170
$(package)_config_opts += -v
8271
$(package)_config_opts += -no-feature-printer
8372
$(package)_config_opts += -no-feature-printdialog
73+
$(package)_config_opts += -no-feature-concurrent
74+
$(package)_config_opts += -no-feature-xml
8475

8576
ifneq ($(build_os),darwin)
8677
$(package)_config_opts_darwin = -xplatform macx-clang-linux
@@ -95,7 +86,7 @@ endif
9586
$(package)_config_opts_linux = -qt-xkbcommon
9687
$(package)_config_opts_linux += -qt-xcb
9788
$(package)_config_opts_linux += -system-freetype
98-
$(package)_config_opts_linux += -no-sm
89+
$(package)_config_opts_linux += -no-feature-sessionmanager
9990
$(package)_config_opts_linux += -fontconfig
10091
$(package)_config_opts_linux += -no-opengl
10192
$(package)_config_opts_arm_linux = -platform linux-g++ -xplatform $(host)
@@ -124,11 +115,10 @@ define $(package)_extract_cmds
124115
tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools
125116
endef
126117

127-
128118
define $(package)_preprocess_cmds
129119
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
130120
sed -i.old "/updateqm.depends =/d" qttranslations/translations/translations.pro && \
131-
sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
121+
sed -i.old "s/src_plugins.depends = src_sql src_network/src_plugins.depends = src_network/" qtbase/src/src.pro && \
132122
sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
133123
sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \
134124
sed -i.old 's/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0)/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft)/' qtbase/src/plugins/platforms/cocoa/qcocoacursor.mm && \
@@ -137,19 +127,17 @@ define $(package)_preprocess_cmds
137127
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
138128
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
139129
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
140-
patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
141-
patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
142-
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
143-
patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
144-
patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
145-
patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
130+
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
131+
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
132+
patch -p1 -i $($(package)_patch_dir)/qfixed-coretext.patch &&\
146133
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
147134
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
148135
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
136+
echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
137+
echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
149138
sed -i.old "s|QMAKE_CFLAGS = |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
150139
sed -i.old "s|QMAKE_LFLAGS = |!host_build: QMAKE_LFLAGS = $($(package)_ldflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
151140
sed -i.old "s|QMAKE_CXXFLAGS = |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf
152-
153141
endef
154142

155143
define $(package)_config_cmds
@@ -161,19 +149,22 @@ define $(package)_config_cmds
161149
echo "CONFIG += force_bootstrap" >> mkspecs/qconfig.pri && \
162150
$(MAKE) sub-src-clean && \
163151
cd ../qttranslations && ../qtbase/bin/qmake qttranslations.pro -o Makefile && \
164-
cd translations && ../../qtbase/bin/qmake translations.pro -o Makefile && cd ../.. &&\
165-
cd qttools/src/linguist/lrelease/ && ../../../../qtbase/bin/qmake lrelease.pro -o Makefile
152+
cd translations && ../../qtbase/bin/qmake translations.pro -o Makefile && cd ../.. && \
153+
cd qttools/src/linguist/lrelease/ && ../../../../qtbase/bin/qmake lrelease.pro -o Makefile && \
154+
cd ../lupdate/ && ../../../../qtbase/bin/qmake lupdate.pro -o Makefile && cd ../../../..
166155
endef
167156

168157
define $(package)_build_cmds
169158
$(MAKE) -C src $(addprefix sub-,$($(package)_qt_libs)) && \
170159
$(MAKE) -C ../qttools/src/linguist/lrelease && \
160+
$(MAKE) -C ../qttools/src/linguist/lupdate && \
171161
$(MAKE) -C ../qttranslations
172162
endef
173163

174164
define $(package)_stage_cmds
175-
$(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && cd .. &&\
165+
$(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && cd .. && \
176166
$(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install_target && \
167+
$(MAKE) -C qttools/src/linguist/lupdate INSTALL_ROOT=$($(package)_staging_dir) install_target && \
177168
$(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
178169
if `test -f qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a`; then \
179170
cp qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a $($(package)_staging_prefix_dir)/lib; \

0 commit comments

Comments
 (0)