summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-02-08 14:57:55 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-02-12 15:29:11 +0000
commit72ac998cef3306e6e4d2f3760af1c21cedfc330f (patch)
tree3f053fe2a95aa1a2dd02d98cf7efdfdf80dd4578
parent95549f64bb26b7a27ed27028309fd3760dde5f83 (diff)
downloadmeta-qt5-72ac998cef3306e6e4d2f3760af1c21cedfc330f.tar.gz
qt5: Update to Qt 5.6.0 branch
Change-Id: I7263e17eae03b942e915d4cc80e7e40a9028889a Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb6
-rw-r--r--recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch62
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch45
-rw-r--r--recipes-qt/qt5/qtbase_git.bb7
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb8
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb7
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb5
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
30 files changed, 99 insertions, 93 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index ba361113..754fde35 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -6,8 +6,8 @@ HOMEPAGE = "http://qt-project.org"
6 6
7LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 7LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
8LIC_FILES_CHKSUM = " \ 8LIC_FILES_CHKSUM = " \
9 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 9 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
10 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 10 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
11 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 11 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
12 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 12 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -261,4 +261,4 @@ fakeroot do_generate_qt_environment_file_mingw32() {
261 261
262addtask generate_qt_environment_file after do_install before do_package 262addtask generate_qt_environment_file after do_install before do_package
263 263
264SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62" 264SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 0ec99c61..dff99af1 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -15,4 +15,4 @@ FILES_${PN}-qmlplugins += " \
15 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 15 ${OE_QMAKE_PATH_QML}/*/*/*.obj \
16" 16"
17 17
18SRCREV = "9b9f34701f47824e8201453d148152fb0855f98a" 18SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index f8fb38b7..16381500 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.6" 5QT_MODULE_BRANCH ?= "5.6.0"
6 6
7# each module needs to define valid SRCREV 7# each module needs to define valid SRCREV
8SRC_URI = " \ 8SRC_URI = " \
@@ -11,7 +11,7 @@ SRC_URI = " \
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14PV = "5.5.99+5.6.0-alpha1+git${SRCPV}" 14PV = "5.6.0+git${SRCPV}"
15 15
16#LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 16#LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
17#LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 17#LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index dc328d77..485675a8 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -4,8 +4,8 @@ SECTION = "libs"
4HOMEPAGE = "http://qt-project.org" 4HOMEPAGE = "http://qt-project.org"
5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 5LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
6LIC_FILES_CHKSUM = " \ 6LIC_FILES_CHKSUM = " \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 9 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 10 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -116,4 +116,4 @@ do_install() {
116 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 116 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
117} 117}
118 118
119SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62" 119SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a"
diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
index 557cffa8..bfe1ba8b 100644
--- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
+++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
@@ -1,4 +1,4 @@
1From 89784751fa045f0bf86bc87b9be4dd5b19e1227d Mon Sep 17 00:00:00 2001 1From 4a99cb44a7913ff86e644dc08578e579958983a4 Mon Sep 17 00:00:00 2001
2From: David Schulz <david.schulz@theqtcompany.com> 2From: David Schulz <david.schulz@theqtcompany.com>
3Date: Mon, 12 Oct 2015 09:55:30 +0200 3Date: Mon, 12 Oct 2015 09:55:30 +0200
4Subject: [PATCH] configure: Separate host and build platform. 4Subject: [PATCH] configure: Separate host and build platform.
@@ -17,7 +17,7 @@ Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc
17 config.tests/unix/compile.test | 6 +- 17 config.tests/unix/compile.test | 6 +-
18 configure | 163 ++++++++++++++++++++++++++++++++----- 18 configure | 163 ++++++++++++++++++++++++++++++++-----
19 mkspecs/features/device_config.prf | 15 ++-- 19 mkspecs/features/device_config.prf | 15 ++--
20 mkspecs/features/qt_functions.prf | 2 +- 20 mkspecs/features/qt_functions.prf | 2 +-
21 mkspecs/features/qt_tool.prf | 57 ++++++++----- 21 mkspecs/features/qt_tool.prf | 57 ++++++++-----
22 qmake/qmake-aux.pro | 11 +++ 22 qmake/qmake-aux.pro | 11 +++
23 qmake/qmake-docs.pro | 2 - 23 qmake/qmake-docs.pro | 2 -
@@ -51,7 +51,7 @@ index c50bd8b..cfb47de 100755
51 51
52 ARCH="" 52 ARCH=""
53diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test 53diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
54index 103321e..57769a3 100755 54index 65bc874..45c365c 100755
55--- a/config.tests/unix/compile.test 55--- a/config.tests/unix/compile.test
56+++ b/config.tests/unix/compile.test 56+++ b/config.tests/unix/compile.test
57@@ -10,7 +10,9 @@ OUTDIR=$5 57@@ -10,7 +10,9 @@ OUTDIR=$5
@@ -69,13 +69,13 @@ index 103321e..57769a3 100755
69 # Make sure output from possible previous tests is gone 69 # Make sure output from possible previous tests is gone
70 rm -f "$EXE" "${EXE}.exe" 70 rm -f "$EXE" "${EXE}.exe"
71 71
72-set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" 72-set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
73+set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" 73+set -- "$QMAKE" -qtconf "$QTCONF" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
74 if [ "$VERBOSE" = "yes" ]; then 74 if [ "$VERBOSE" = "yes" ]; then
75 OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes 75 OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
76 else 76 else
77diff --git a/configure b/configure 77diff --git a/configure b/configure
78index 52c1be2..6b89d34 100755 78index d923bbb..175eb02 100755
79--- a/configure 79--- a/configure
80+++ b/configure 80+++ b/configure
81@@ -104,9 +104,11 @@ QT_CONFIG= 81@@ -104,9 +104,11 @@ QT_CONFIG=
@@ -118,7 +118,7 @@ index 52c1be2..6b89d34 100755
118 if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi 118 if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
119 fi 119 fi
120 getSingleQMakeVariable "$1" "$specvals" 120 getSingleQMakeVariable "$1" "$specvals"
121@@ -345,7 +347,7 @@ getQMakeConf() 121@@ -355,7 +357,7 @@ getQEvalMakeConf()
122 getXQMakeConf() 122 getXQMakeConf()
123 { 123 {
124 if [ -z "$xspecvals" ]; then 124 if [ -z "$xspecvals" ]; then
@@ -127,7 +127,7 @@ index 52c1be2..6b89d34 100755
127 if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi 127 if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi
128 fi 128 fi
129 getSingleQMakeVariable "$1" "$xspecvals" 129 getSingleQMakeVariable "$1" "$xspecvals"
130@@ -478,6 +480,23 @@ resolveDeviceMkspec() 130@@ -498,6 +500,23 @@ resolveDeviceMkspec()
131 } 131 }
132 132
133 #------------------------------------------------------------------------------- 133 #-------------------------------------------------------------------------------
@@ -151,7 +151,7 @@ index 52c1be2..6b89d34 100755
151 # operating system detection 151 # operating system detection
152 #------------------------------------------------------------------------------- 152 #-------------------------------------------------------------------------------
153 153
154@@ -502,12 +521,10 @@ BUILD_ON_MAC=no 154@@ -522,12 +541,10 @@ BUILD_ON_MAC=no
155 if [ -d /System/Library/Frameworks/Carbon.framework ]; then 155 if [ -d /System/Library/Frameworks/Carbon.framework ]; then
156 BUILD_ON_MAC=yes 156 BUILD_ON_MAC=yes
157 fi 157 fi
@@ -164,7 +164,7 @@ index 52c1be2..6b89d34 100755
164 DEV_NULL=/tmp/empty-file 164 DEV_NULL=/tmp/empty-file
165 echo "" > $DEV_NULL 165 echo "" > $DEV_NULL
166 relpath=`(cd "$relpath"; pwd -W)` 166 relpath=`(cd "$relpath"; pwd -W)`
167@@ -922,6 +939,7 @@ while [ "$#" -gt 0 ]; do 167@@ -932,6 +949,7 @@ while [ "$#" -gt 0 ]; do
168 -hostlibdir| \ 168 -hostlibdir| \
169 -extprefix| \ 169 -extprefix| \
170 -sysroot| \ 170 -sysroot| \
@@ -172,7 +172,7 @@ index 52c1be2..6b89d34 100755
172 -depths| \ 172 -depths| \
173 -make| \ 173 -make| \
174 -nomake| \ 174 -nomake| \
175@@ -930,6 +948,7 @@ while [ "$#" -gt 0 ]; do 175@@ -940,6 +958,7 @@ while [ "$#" -gt 0 ]; do
176 -xplatform| \ 176 -xplatform| \
177 -device| \ 177 -device| \
178 -device-option| \ 178 -device-option| \
@@ -180,7 +180,7 @@ index 52c1be2..6b89d34 100755
180 -sdk| \ 180 -sdk| \
181 -arch| \ 181 -arch| \
182 -host-arch| \ 182 -host-arch| \
183@@ -1249,6 +1268,10 @@ while [ "$#" -gt 0 ]; do 183@@ -1259,6 +1278,10 @@ while [ "$#" -gt 0 ]; do
184 gcc-sysroot) 184 gcc-sysroot)
185 CFG_GCC_SYSROOT="$VAL" 185 CFG_GCC_SYSROOT="$VAL"
186 ;; 186 ;;
@@ -191,7 +191,7 @@ index 52c1be2..6b89d34 100755
191 bindir) 191 bindir)
192 QT_INSTALL_BINS="$VAL" 192 QT_INSTALL_BINS="$VAL"
193 ;; 193 ;;
194@@ -1423,6 +1446,11 @@ while [ "$#" -gt 0 ]; do 194@@ -1433,6 +1456,11 @@ while [ "$#" -gt 0 ]; do
195 DEV_VAL=`echo $VAL | cut -d '=' -f 2-` 195 DEV_VAL=`echo $VAL | cut -d '=' -f 2-`
196 DeviceVar set $DEV_VAR "$DEV_VAL" 196 DeviceVar set $DEV_VAR "$DEV_VAL"
197 ;; 197 ;;
@@ -203,7 +203,7 @@ index 52c1be2..6b89d34 100755
203 qpa) 203 qpa)
204 QT_QPA_DEFAULT_PLATFORM="$VAL" 204 QT_QPA_DEFAULT_PLATFORM="$VAL"
205 ;; 205 ;;
206@@ -2671,6 +2699,8 @@ Additional options: 206@@ -2683,6 +2711,8 @@ Additional options:
207 -device-option <key=value> ... Add device specific options for the device mkspec 207 -device-option <key=value> ... Add device specific options for the device mkspec
208 (experimental) 208 (experimental)
209 209
@@ -212,7 +212,7 @@ index 52c1be2..6b89d34 100755
212 * -no-separate-debug-info . Do not store debug information in a separate file. 212 * -no-separate-debug-info . Do not store debug information in a separate file.
213 -separate-debug-info .... Strip debug information into a separate file. 213 -separate-debug-info .... Strip debug information into a separate file.
214 214
215@@ -2702,6 +2732,9 @@ Additional options: 215@@ -2714,6 +2744,9 @@ Additional options:
216 -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths. 216 -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths.
217 -no-gcc-sysroot ..... When using -sysroot, it disables the passing of --sysroot to the compiler 217 -no-gcc-sysroot ..... When using -sysroot, it disables the passing of --sysroot to the compiler
218 218
@@ -222,7 +222,7 @@ index 52c1be2..6b89d34 100755
222 -no-feature-<feature> Do not compile in <feature>. 222 -no-feature-<feature> Do not compile in <feature>.
223 -feature-<feature> .. Compile in <feature>. The available features 223 -feature-<feature> .. Compile in <feature>. The available features
224 are described in src/corelib/global/qfeatures.txt 224 are described in src/corelib/global/qfeatures.txt
225@@ -3301,7 +3301,7 @@ if [ -d "$XPLATFORM" ]; then 225@@ -3280,7 +3313,7 @@ if [ -d "$XPLATFORM" ]; then
226 else 226 else
227 XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}" 227 XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}"
228 fi 228 fi
@@ -231,7 +231,7 @@ index 52c1be2..6b89d34 100755
231 QT_CROSS_COMPILE=yes 231 QT_CROSS_COMPILE=yes
232 QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" 232 QMAKE_CONFIG="$QMAKE_CONFIG cross_compile"
233 QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile" 233 QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile"
234@@ -4039,7 +4072,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 234@@ -4059,7 +4092,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
235 EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS" 235 EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"
236 done 236 done
237 fi 237 fi
@@ -241,7 +241,7 @@ index 52c1be2..6b89d34 100755
241 EXTRA_CFLAGS="-DUNICODE" 241 EXTRA_CFLAGS="-DUNICODE"
242 EXTRA_CXXFLAGS="-DUNICODE" 242 EXTRA_CXXFLAGS="-DUNICODE"
243 EXTRA_OBJS="qfilesystemengine_win.o \ 243 EXTRA_OBJS="qfilesystemengine_win.o \
244@@ -4058,7 +4092,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 244@@ -4078,7 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
245 \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\"" 245 \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\""
246 EXTRA_LFLAGS="-static -s -lole32 -luuid -ladvapi32 -lkernel32" 246 EXTRA_LFLAGS="-static -s -lole32 -luuid -ladvapi32 -lkernel32"
247 EXEEXT=".exe" 247 EXEEXT=".exe"
@@ -269,7 +269,7 @@ index 52c1be2..6b89d34 100755
269 echo >>"$mkfile" 269 echo >>"$mkfile"
270 adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` 270 adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
271 adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` 271 adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
272@@ -4158,7 +4195,81 @@ QTCONFFILE="$outpath/bin/qt.conf" 272@@ -4178,7 +4215,81 @@ QTCONFFILE="$outpath/bin/qt.conf"
273 cat > "$QTCONFFILE" <<EOF 273 cat > "$QTCONFFILE" <<EOF
274 [EffectivePaths] 274 [EffectivePaths]
275 Prefix=.. 275 Prefix=..
@@ -351,7 +351,7 @@ index 52c1be2..6b89d34 100755
351 if [ x"$relpath" != x"$outpath" ]; then 351 if [ x"$relpath" != x"$outpath" ]; then
352 cat >> "$QTCONFFILE" <<EOF 352 cat >> "$QTCONFFILE" <<EOF
353 [EffectiveSourcePaths] 353 [EffectiveSourcePaths]
354@@ -4166,6 +4277,9 @@ Prefix=$relpath 354@@ -4186,6 +4297,9 @@ Prefix=$relpath
355 EOF 355 EOF
356 fi 356 fi
357 357
@@ -361,7 +361,7 @@ index 52c1be2..6b89d34 100755
361 #------------------------------------------------------------------------------- 361 #-------------------------------------------------------------------------------
362 # write out device config before we run the test. 362 # write out device config before we run the test.
363 #------------------------------------------------------------------------------- 363 #-------------------------------------------------------------------------------
364@@ -4178,9 +4292,20 @@ else 364@@ -4198,9 +4312,20 @@ else
365 fi 365 fi
366 366
367 #------------------------------------------------------------------------------- 367 #-------------------------------------------------------------------------------
@@ -383,7 +383,7 @@ index 52c1be2..6b89d34 100755
383 if [ $? != "0" ]; then 383 if [ $? != "0" ]; then
384 echo "Failed to process makespec for platform '$XPLATFORM'" 384 echo "Failed to process makespec for platform '$XPLATFORM'"
385 if [ "$OPT_VERBOSE" = "yes" ]; then 385 if [ "$OPT_VERBOSE" = "yes" ]; then
386@@ -4196,7 +4321,7 @@ fi 386@@ -4216,7 +4341,7 @@ fi
387 #------------------------------------------------------------------------------- 387 #-------------------------------------------------------------------------------
388 if [ -z "$PKG_CONFIG" ]; then 388 if [ -z "$PKG_CONFIG" ]; then
389 # See if PKG_CONFIG is set in the mkspec: 389 # See if PKG_CONFIG is set in the mkspec:
@@ -392,7 +392,7 @@ index 52c1be2..6b89d34 100755
392 [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG" 392 [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG"
393 fi 393 fi
394 if [ -z "$PKG_CONFIG" ]; then 394 if [ -z "$PKG_CONFIG" ]; then
395@@ -4271,7 +4396,7 @@ compileTest() 395@@ -4291,7 +4416,7 @@ compileTest()
396 if [ "$CFG_SHARED" = "no" ]; then 396 if [ "$CFG_SHARED" = "no" ]; then
397 test_config="$QMAKE_CONFIG static" 397 test_config="$QMAKE_CONFIG static"
398 fi 398 fi
@@ -401,7 +401,7 @@ index 52c1be2..6b89d34 100755
401 } 401 }
402 402
403 compileTestWithPkgConfig() 403 compileTestWithPkgConfig()
404@@ -4320,7 +4445,7 @@ compileTestWithPkgConfig() 404@@ -4340,7 +4465,7 @@ compileTestWithPkgConfig()
405 405
406 # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is 406 # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is
407 OUTFILE=$outpath/arch.result 407 OUTFILE=$outpath/arch.result
@@ -410,7 +410,7 @@ index 52c1be2..6b89d34 100755
410 if [ $? -eq 0 ]; then 410 if [ $? -eq 0 ]; then
411 eval `cat "$OUTFILE"` 411 eval `cat "$OUTFILE"`
412 else 412 else
413@@ -4333,7 +4458,7 @@ rm -f "$OUTFILE" 2>/dev/null 413@@ -4353,7 +4478,7 @@ rm -f "$OUTFILE" 2>/dev/null
414 414
415 if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then 415 if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then
416 # Do the same test again, using the host compiler 416 # Do the same test again, using the host compiler
@@ -419,7 +419,7 @@ index 52c1be2..6b89d34 100755
419 if [ $? -eq 0 ]; then 419 if [ $? -eq 0 ]; then
420 eval `cat "$OUTFILE"` 420 eval `cat "$OUTFILE"`
421 else 421 else
422@@ -4549,7 +4674,7 @@ fi 422@@ -4569,7 +4694,7 @@ fi
423 423
424 # detect mips_dsp support 424 # detect mips_dsp support
425 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then 425 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then
@@ -428,7 +428,7 @@ index 52c1be2..6b89d34 100755
428 CFG_MIPS_DSP=yes 428 CFG_MIPS_DSP=yes
429 else 429 else
430 CFG_MIPS_DSP=no 430 CFG_MIPS_DSP=no
431@@ -4560,7 +4685,7 @@ fi 431@@ -4580,7 +4705,7 @@ fi
432 432
433 # detect mips_dspr2 support 433 # detect mips_dspr2 support
434 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then 434 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then
@@ -437,7 +437,7 @@ index 52c1be2..6b89d34 100755
437 CFG_MIPS_DSPR2=yes 437 CFG_MIPS_DSPR2=yes
438 else 438 else
439 CFG_MIPS_DSPR2=no 439 CFG_MIPS_DSPR2=no
440@@ -7447,7 +7572,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null 440@@ -7467,7 +7592,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
441 cd .. 441 cd ..
442 fi 442 fi
443 443
@@ -475,7 +475,7 @@ index e0383ef..9281d3e 100644
475 # Provide a function to be used by mkspecs 475 # Provide a function to be used by mkspecs
476 defineTest(deviceSanityCheckCompiler) { 476 defineTest(deviceSanityCheckCompiler) {
477diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 477diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
478index 00f4bdf..6615995 100644 478index b2c2507..c16005f 100644
479--- a/mkspecs/features/qt_functions.prf 479--- a/mkspecs/features/qt_functions.prf
480+++ b/mkspecs/features/qt_functions.prf 480+++ b/mkspecs/features/qt_functions.prf
481@@ -57,7 +57,7 @@ defineTest(qtHaveModule) { 481@@ -57,7 +57,7 @@ defineTest(qtHaveModule) {
@@ -488,7 +488,7 @@ index 00f4bdf..6615995 100644
488 cmd = perl -w $$system_path($${cmd}.pl) 488 cmd = perl -w $$system_path($${cmd}.pl)
489 } else: contains(QMAKE_HOST.os, Windows) { 489 } else: contains(QMAKE_HOST.os, Windows) {
490diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 490diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
491index 3f0301a..add121d 100644 491index 839c3d6..45f1b94 100644
492--- a/mkspecs/features/qt_tool.prf 492--- a/mkspecs/features/qt_tool.prf
493+++ b/mkspecs/features/qt_tool.prf 493+++ b/mkspecs/features/qt_tool.prf
494@@ -17,39 +17,52 @@ DEFINES *= QT_USE_QSTRINGBUILDER 494@@ -17,39 +17,52 @@ DEFINES *= QT_USE_QSTRINGBUILDER
@@ -639,5 +639,5 @@ index 98ca86a..11cff9e 100644
639 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst 639 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
640 INSTALLS += mkspecs 640 INSTALLS += mkspecs
641-- 641--
6422.5.0.windows.1 6421.9.1
643 643
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index 2bbb92cc..d82fef21 100644
--- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,7 +1,7 @@
1From a76a6c33be512a2909904b6136a6044e4b747ffd Mon Sep 17 00:00:00 2001 1From 9d880bebf7efc83495487f8ea9a434956fe98eb0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200 3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 4/9] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -26,7 +26,7 @@ Content-Transfer-Encoding: 8bit
26* qmake does not prefix them with QT_SYSROOT when using them 26* qmake does not prefix them with QT_SYSROOT when using them
27 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE 27 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
28 variable, which is unsafe for cross-compilation 28 variable, which is unsafe for cross-compilation
29* writting QT_SYSROOT in .prl files is dangerous for sstate when 29* writing QT_SYSROOT in .prl files is dangerous for sstate when
30 builds are in different directories, so we need 30 builds are in different directories, so we need
31 SSTATE_SCAN_FILES += "*.pri *.prl" 31 SSTATE_SCAN_FILES += "*.pri *.prl"
32 to make them relocateble 32 to make them relocateble
@@ -63,8 +63,8 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
63Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 63Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
64--- 64---
65 mkspecs/features/qt_common.prf | 2 +- 65 mkspecs/features/qt_common.prf | 2 +-
66 mkspecs/features/qt_module.prf | 10 ++++++++++ 66 mkspecs/features/qt_module.prf | 11 +++++++++++
67 2 files changed, 11 insertions(+), 1 deletion(-) 67 2 files changed, 12 insertions(+), 1 deletion(-)
68 68
69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
70index 38602f6..f9c401f 100644 70index 38602f6..f9c401f 100644
@@ -80,33 +80,34 @@ index 38602f6..f9c401f 100644
80 lib_replace.CONFIG = path 80 lib_replace.CONFIG = path
81 QMAKE_PRL_INSTALL_REPLACE += lib_replace 81 QMAKE_PRL_INSTALL_REPLACE += lib_replace
82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
83index 193629b..38ff9a8 100644 83index fdce486..8e7a650 100644
84--- a/mkspecs/features/qt_module.prf 84--- a/mkspecs/features/qt_module.prf
85+++ b/mkspecs/features/qt_module.prf 85+++ b/mkspecs/features/qt_module.prf
86@@ -255,6 +255,11 @@ unix|mingw { 86@@ -259,6 +259,11 @@ load(qt_targets)
87 pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
87 pclib_replace.CONFIG = path 88 pclib_replace.CONFIG = path
88 QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace 89 QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
89 90+
90+ pkgconfig_include_replace.match = $$rplbase/include 91+ pkgconfig_include_replace.match = $$rplbase/include
91+ pkgconfig_include_replace.replace = "\$$\\{includedir}" 92+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
92+ pkgconfig_include_replace.CONFIG = path 93+ pkgconfig_include_replace.CONFIG = path
93+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace 94+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace
95 }
96 !lib_bundle:unix {
97 CONFIG += create_libtool
98@@ -271,6 +276,12 @@ load(qt_targets)
99 ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
100 ltlib_replace.CONFIG = path
101 QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
94+ 102+
95 unix { 103+ # drop -L/usr/lib in .prl files
96 CONFIG += create_libtool explicitlib 104+ prl_replace.match = "-L\$${libdir}"
97 host_build: \ 105+ prl_replace.replace = ""
98@@ -266,6 +271,11 @@ unix|mingw { 106+ prl_replace.CONFIG = path
99 ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR 107+ QMAKE_PRL_INSTALL_REPLACE += prl_replace
100 ltlib_replace.CONFIG = path
101 QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
102+ # drop -L/usr/lib in .prl files
103+ prl_replace.match = "-L\$${libdir}"
104+ prl_replace.replace = ""
105+ prl_replace.CONFIG = path
106+ QMAKE_PRL_INSTALL_REPLACE += prl_replace
107 }
108 } 108 }
109 109
110 contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
110-- 111--
1112.6.2 1121.9.1
112 113
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 62442bc9..998d7795 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -3,8 +3,8 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -208,6 +208,7 @@ do_install_append() {
208 # Remove macx-ios-clang directory because /usr/lib/qt5/mkspecs/macx-ios-clang/rename_main.sh:#!/bin/bash 208 # Remove macx-ios-clang directory because /usr/lib/qt5/mkspecs/macx-ios-clang/rename_main.sh:#!/bin/bash
209 # triggers QA Issue: qtbase-mkspecs requires /bin/bash, but no providers in its RDEPENDS [file-rdeps] 209 # triggers QA Issue: qtbase-mkspecs requires /bin/bash, but no providers in its RDEPENDS [file-rdeps]
210 rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang 210 rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang
211 rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/data/mac
211 212
212 # Replace host paths with qmake built-in properties 213 # Replace host paths with qmake built-in properties
213 sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \ 214 sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \
@@ -249,4 +250,4 @@ sysroot_stage_dirs_append() {
249 rm -rf $to${OE_QMAKE_PATH_QT_FONTS} 250 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
250} 251}
251 252
252SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62" 253SRCREV = "8c2b4266002736da499d169a0da187e5cdc5381a"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index c892d9b3..a5940f25 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "a84dad27182ba6cb4c6f9bf4008a9e63346a7a83" 13SRCREV = "f669d1708c1009adc7d82d42bf550e0d971e827f"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index f677f710..e3113847 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -25,4 +25,4 @@ do_configure_prepend() {
25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
26} 26}
27 27
28SRCREV = "a7617f963c1d375fb7ac7d5c17f450acdb2796b8" 28SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index a78d62f4..c466a52a 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -38,6 +38,6 @@ do_install_append_class-nativesdk() {
38 38
39EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 39EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
40 40
41SRCREV = "1064d5100f4d00af5f56b87331251f97d78f8b87" 41SRCREV = "19dffeed2e677cf03b6e122c7a15f355ebe413c8"
42 42
43BBCLASSEXTEND =+ "native nativesdk" 43BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 5854abe3..23b9417c 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 12DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
13 13
14SRCREV = "34d66f3836051dca35a854577fe04b45af3630f2" 14SRCREV = "2a19257a5eef7a25a05d5cf7ea69ecc4184226f3"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 463e15be..f80f6fad 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20SRCREV = "ad227e9808288b12726114365ae1474386c6cdf8" 20SRCREV = "2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index a847fb28..0a97f121 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_
28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
30 30
31SRCREV = "67cbcf399aa1a18b9b1dbac0a6572a865687230a" 31SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 2c66ad47..d6857edb 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "1fd85dd9426b65198b396c686edd42e42d5b8149" 32SRCREV = "a2b6581e5a865ec1a3a7006b668e36c64d2f7ef5"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 96a21cd8..36d7f408 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
36" 36"
37 37
38SRCREV = "ac1b772ec8e428acd23322a6fccbde2bda6b8bd2" 38SRCREV = "d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index d7cf4345..9d7ddbd6 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -23,4 +23,4 @@ do_configure_prepend() {
23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro 23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro
24} 24}
25 25
26SRCREV = "b0382acf65dbc0debcb7cf956ba954117a682d90" 26SRCREV = "dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 644b70ec..5894c533 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -13,4 +13,4 @@ DEPENDS += "qtdeclarative"
13 13
14RDEPENDS_${PN}-dev = "" 14RDEPENDS_${PN}-dev = ""
15 15
16SRCREV = "2e48d16e4a230069884ac0585ae111037f4171fb" 16SRCREV = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index c53217a3..eea6911c 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
27 27
28DEPENDS += "qtbase" 28DEPENDS += "qtbase"
29 29
30SRCREV = "7ebf02ea3e8e91b13eb2d34847c005d8a487e9da" 30SRCREV = "a70f6a1b9599931fccd13b15a1700e61137f7e72"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index a422544b..ca0ba4a8 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase qtdeclarative" 16DEPENDS += "qtbase qtdeclarative"
17 17
18SRCREV = "d8d4a5e9ac1251e82d1ec639bc3bff7e7f53c083" 18SRCREV = "ad52d307cbff44b77bf7d4fa923377b72bb04374"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index c95844c5..db6a289c 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "2575d33fab4042baba67384f92119c58c0ce0245" 18SRCREV = "6dda140ada3d7c683537b069bf1512275a190884"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 57e9b4fa..83abbe6b 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "9ee5ee12a7b92a57624dafed935b3ac1fad426d9" 16SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c"
17 17
18SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch" 18SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 9d9d245d..0152e8a5 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -33,4 +33,4 @@ QT_MODULE_BRANCH = "dev"
33# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 33# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
34# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6 34# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.6
35 35
36SRCREV = "0577ffca58b7fed78c1820fc1c2b7ab3533d5698" 36SRCREV = "37b614abbfb35d06a57e5b0824249c3abd5640e3"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 5ee1e865..96b41274 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -3,9 +3,9 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11" 11"
@@ -32,6 +32,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
33EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
34 34
35SRCREV = "57301c0003e9d776d31953f1411cc06a395b752e" 35SRCREV = "eb59d8084af321d05b4ebdfb2c1e051dfdca0b62"
36 36
37BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 72a29b3b..193e2039 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -21,6 +21,7 @@ PACKAGES =. " \
21 ${PN}-qtlocation \ 21 ${PN}-qtlocation \
22 ${PN}-qtdeclarative \ 22 ${PN}-qtdeclarative \
23 ${PN}-qtquickcontrols \ 23 ${PN}-qtquickcontrols \
24 ${PN}-qtquickcontrols2 \
24 ${PN}-qtwebsockets \ 25 ${PN}-qtwebsockets \
25 ${PN}-qtxmlpatterns \ 26 ${PN}-qtxmlpatterns \
26 ${PN}-qtconfig \ 27 ${PN}-qtconfig \
@@ -68,6 +69,10 @@ FILES_${PN}-qtquickcontrols = " \
68 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols_*.qm \ 69 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols_*.qm \
69" 70"
70 71
72FILES_${PN}-qtquickcontrols2 = " \
73 ${OE_QMAKE_PATH_TRANSLATIONS}/qtquickcontrols2_*.qm \
74"
75
71FILES_${PN}-qtwebsockets = " \ 76FILES_${PN}-qtwebsockets = " \
72 ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebsockets_*.qm \ 77 ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebsockets_*.qm \
73" 78"
@@ -104,4 +109,4 @@ FILES_${PN}-qt = " \
104 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 109 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
105" 110"
106 111
107SRCREV = "9c6d1af76ac28de8d59be344ea3a21b2607fa118" 112SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index afe737a9..390f4e66 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -25,4 +25,4 @@ do_install() {
25 oe_runmake install INSTALL_ROOT=${D} 25 oe_runmake install INSTALL_ROOT=${D}
26} 26}
27 27
28SRCREV = "bd21beea9a433a8878c0e719a7bfb8c14df47840" 28SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 059c2dbc..c4730a7e 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -38,4 +38,4 @@ SRC_URI += " \
38 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 38 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
39" 39"
40 40
41SRCREV = "bd21beea9a433a8878c0e719a7bfb8c14df47840" 41SRCREV = "baec8be7294a176620253dbbc1b2938cf96c8360"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index e070d13d..7d923d8d 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative qtwebsockets" 16DEPENDS += "qtdeclarative qtwebsockets"
17 17
18SRCREV = "97577a0f27a1f427948871ae535645a2e0788bf7" 18SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index b5d0b586..8375fec7 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -110,15 +110,14 @@ SRC_URI += " \
110 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ 110 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
111 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 111 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
112 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ 112 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
113 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
114 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ 113 file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
115 file://0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch \ 114 file://0002-media_capture_devices_dispatcher.h-Include-QCoreApplication-translate.patch \
116 file://0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch \ 115 file://0003-WebEngine-qquickwebengineview_p_p.h-add-inc-QColor.patch \
117 file://0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch \ 116 file://0001-chromium-jpeg_codec.cc_Change-false-to-FALSE-and-1-to-TRUE.patch \
118" 117"
119 118
120SRCREV_qtwebengine = "40ef43e0d69c4a86c9430b7f264d2cde6340ee0f" 119SRCREV_qtwebengine = "87cc80fd8182b24ff42f0f5458cb82f139730536"
121SRCREV_chromium = "ec5b3304fc266dfdec7666b8b73d57a3971ea35f" 120SRCREV_chromium = "3f655a31b4979b0862e5aec1c8f47b597464749f"
122SRCREV = "${SRCREV_qtwebengine}" 121SRCREV = "${SRCREV_qtwebengine}"
123 122
124SRCREV_FORMAT = "qtwebengine_chromium" 123SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index a9523065..19b9c5a5 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -65,4 +65,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
65RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 65RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
66export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 66export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
67 67
68SRCREV = "93cc8d306f8033551fb60e2e1f8f480330778a21" 68SRCREV = "be8e169ba38c84562194906047d0da04bf3ae91a"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 4b511d0c..2f24933b 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "94136d42805abeaf3dd9d6ded7b74e3d27fd3777" 16SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915"
17 17
18BBCLASSEXTEND =+ "native nativesdk" 18BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-26 04:36:03 +0000