diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-02 10:06:10 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-03 10:51:00 +0000 |
commit | ce9a8d9537e3baa7d485128a3f41451d7dca7770 (patch) | |
tree | 030caf1f9db4c7764cebffef9a82d56795681c27 | |
parent | afb62012ec358e12fcad06e8096be1f6ec13f1ba (diff) | |
download | meta-qt5-ce9a8d9537e3baa7d485128a3f41451d7dca7770.tar.gz |
qt5: update submodules
NIS support leftover from Qt 3/4 were removed from qtbase with
commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db
Change-Id: I335ef269126b89064a5038e0d200faf72a36bddf
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
33 files changed, 73 insertions, 76 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index eec21e47..9d276a67 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -150,7 +150,6 @@ do_configure() { | |||
150 | -no-gif \ | 150 | -no-gif \ |
151 | -no-accessibility \ | 151 | -no-accessibility \ |
152 | -no-cups \ | 152 | -no-cups \ |
153 | -no-nis \ | ||
154 | -no-gui \ | 153 | -no-gui \ |
155 | -no-qml-debug \ | 154 | -no-qml-debug \ |
156 | -no-sql-mysql \ | 155 | -no-sql-mysql \ |
@@ -239,4 +238,4 @@ fakeroot do_generate_qt_environment_file() { | |||
239 | 238 | ||
240 | addtask generate_qt_environment_file after do_install before do_package | 239 | addtask generate_qt_environment_file after do_install before do_package |
241 | 240 | ||
242 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 241 | SRCREV = "6bcd27b957a5ffcfe7665b0979679510e3b2ae3d" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a96b06cf..496051d0 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \ | |||
27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ | 27 | ${OE_QMAKE_PATH_QML}/*/*/*.obj \ |
28 | " | 28 | " |
29 | 29 | ||
30 | SRCREV = "7a208d76ed96bb506899becfe680df06f95451c7" | 30 | SRCREV = "0384f29809186e6a45b13760c9dbb2f8cd3bf251" |
31 | 31 | ||
32 | BBCLASSEXTEND += "native nativesdk" | 32 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 4e093520..65054d28 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -45,7 +45,6 @@ PACKAGECONFIG_CONFARGS = " \ | |||
45 | -no-gif \ | 45 | -no-gif \ |
46 | -no-accessibility \ | 46 | -no-accessibility \ |
47 | -no-cups \ | 47 | -no-cups \ |
48 | -no-nis \ | ||
49 | -no-gui \ | 48 | -no-gui \ |
50 | -no-qml-debug \ | 49 | -no-qml-debug \ |
51 | -no-sql-mysql \ | 50 | -no-sql-mysql \ |
@@ -115,4 +114,4 @@ do_install() { | |||
115 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 114 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
116 | } | 115 | } |
117 | 116 | ||
118 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 117 | SRCREV = "6bcd27b957a5ffcfe7665b0979679510e3b2ae3d" |
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 bdacb469..edd5d9a9 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 @@ | |||
1 | From eb70e52aa796576daa73027c93f2fba77861e4e2 Mon Sep 17 00:00:00 2001 | 1 | From 4b7a986512e5f3accbca6010829e7e094d53ac29 Mon Sep 17 00:00:00 2001 |
2 | From: David Schulz <david.schulz@theqtcompany.com> | 2 | From: David Schulz <david.schulz@theqtcompany.com> |
3 | Date: Mon, 12 Oct 2015 09:55:30 +0200 | 3 | Date: Mon, 12 Oct 2015 09:55:30 +0200 |
4 | Subject: [PATCH] configure: Separate host and build platform. | 4 | Subject: [PATCH] configure: Separate host and build platform. |
@@ -51,7 +51,7 @@ index c50bd8b..cfb47de 100755 | |||
51 | 51 | ||
52 | ARCH="" | 52 | ARCH="" |
53 | diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test | 53 | diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test |
54 | index 598e2a2..b33b74c 100755 | 54 | index 598e2a2..f92560f 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 |
@@ -76,10 +76,10 @@ index 598e2a2..b33b74c 100755 | |||
76 | -spec "$QMKSPEC" \ | 76 | -spec "$QMKSPEC" \ |
77 | "CONFIG+=$QMAKE_CONFIG" \ | 77 | "CONFIG+=$QMAKE_CONFIG" \ |
78 | diff --git a/configure b/configure | 78 | diff --git a/configure b/configure |
79 | index f833869..0d5cae0 100755 | 79 | index d5214bf..0334dfc 100755 |
80 | --- a/configure | 80 | --- a/configure |
81 | +++ b/configure | 81 | +++ b/configure |
82 | @@ -104,9 +104,11 @@ QT_CONFIG= | 82 | @@ -105,9 +105,11 @@ QT_CONFIG= |
83 | SUPPORTED= | 83 | SUPPORTED= |
84 | QMAKE_VARS_FILE=.qmake.vars | 84 | QMAKE_VARS_FILE=.qmake.vars |
85 | DEVICE_VARS_FILE=.device.vars | 85 | DEVICE_VARS_FILE=.device.vars |
@@ -91,7 +91,7 @@ index f833869..0d5cae0 100755 | |||
91 | 91 | ||
92 | #------------------------------------------------------------------------------- | 92 | #------------------------------------------------------------------------------- |
93 | # utility functions | 93 | # utility functions |
94 | @@ -195,15 +197,15 @@ expandQMakeConf() | 94 | @@ -196,15 +198,15 @@ expandQMakeConf() |
95 | echo "WARNING: Unable to find file $conf_file" >&2 | 95 | echo "WARNING: Unable to find file $conf_file" >&2 |
96 | continue | 96 | continue |
97 | fi | 97 | fi |
@@ -110,7 +110,7 @@ index f833869..0d5cae0 100755 | |||
110 | ;; | 110 | ;; |
111 | *) | 111 | *) |
112 | echo "$line" | 112 | echo "$line" |
113 | @@ -336,7 +338,7 @@ macSDKify() | 113 | @@ -337,7 +339,7 @@ macSDKify() |
114 | getQMakeConf() | 114 | getQMakeConf() |
115 | { | 115 | { |
116 | if [ -z "$specvals" ]; then | 116 | if [ -z "$specvals" ]; then |
@@ -119,7 +119,7 @@ index f833869..0d5cae0 100755 | |||
119 | if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi | 119 | if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi |
120 | fi | 120 | fi |
121 | getSingleQMakeVariable "$1" "$specvals" | 121 | getSingleQMakeVariable "$1" "$specvals" |
122 | @@ -355,7 +357,7 @@ getQEvalMakeConf() | 122 | @@ -356,7 +358,7 @@ getQEvalMakeConf() |
123 | getXQMakeConf() | 123 | getXQMakeConf() |
124 | { | 124 | { |
125 | if [ -z "$xspecvals" ]; then | 125 | if [ -z "$xspecvals" ]; then |
@@ -128,7 +128,7 @@ index f833869..0d5cae0 100755 | |||
128 | if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi | 128 | if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi |
129 | fi | 129 | fi |
130 | getSingleQMakeVariable "$1" "$xspecvals" | 130 | getSingleQMakeVariable "$1" "$xspecvals" |
131 | @@ -498,6 +500,23 @@ resolveDeviceMkspec() | 131 | @@ -514,6 +516,23 @@ resolveDeviceMkspec() |
132 | } | 132 | } |
133 | 133 | ||
134 | #------------------------------------------------------------------------------- | 134 | #------------------------------------------------------------------------------- |
@@ -152,7 +152,7 @@ index f833869..0d5cae0 100755 | |||
152 | # operating system detection | 152 | # operating system detection |
153 | #------------------------------------------------------------------------------- | 153 | #------------------------------------------------------------------------------- |
154 | 154 | ||
155 | @@ -522,12 +541,10 @@ BUILD_ON_MAC=no | 155 | @@ -538,12 +557,10 @@ BUILD_ON_MAC=no |
156 | if [ -d /System/Library/Frameworks/Carbon.framework ]; then | 156 | if [ -d /System/Library/Frameworks/Carbon.framework ]; then |
157 | BUILD_ON_MAC=yes | 157 | BUILD_ON_MAC=yes |
158 | fi | 158 | fi |
@@ -165,7 +165,7 @@ index f833869..0d5cae0 100755 | |||
165 | DEV_NULL=/tmp/empty-file | 165 | DEV_NULL=/tmp/empty-file |
166 | echo "" > $DEV_NULL | 166 | echo "" > $DEV_NULL |
167 | relpath=`(cd "$relpath"; pwd -W)` | 167 | relpath=`(cd "$relpath"; pwd -W)` |
168 | @@ -932,6 +949,7 @@ while [ "$#" -gt 0 ]; do | 168 | @@ -948,6 +965,7 @@ while [ "$#" -gt 0 ]; do |
169 | -hostlibdir| \ | 169 | -hostlibdir| \ |
170 | -extprefix| \ | 170 | -extprefix| \ |
171 | -sysroot| \ | 171 | -sysroot| \ |
@@ -173,7 +173,7 @@ index f833869..0d5cae0 100755 | |||
173 | -depths| \ | 173 | -depths| \ |
174 | -make| \ | 174 | -make| \ |
175 | -nomake| \ | 175 | -nomake| \ |
176 | @@ -940,6 +958,7 @@ while [ "$#" -gt 0 ]; do | 176 | @@ -956,6 +974,7 @@ while [ "$#" -gt 0 ]; do |
177 | -xplatform| \ | 177 | -xplatform| \ |
178 | -device| \ | 178 | -device| \ |
179 | -device-option| \ | 179 | -device-option| \ |
@@ -181,7 +181,7 @@ index f833869..0d5cae0 100755 | |||
181 | -sdk| \ | 181 | -sdk| \ |
182 | -arch| \ | 182 | -arch| \ |
183 | -host-arch| \ | 183 | -host-arch| \ |
184 | @@ -1259,6 +1278,10 @@ while [ "$#" -gt 0 ]; do | 184 | @@ -1275,6 +1294,10 @@ while [ "$#" -gt 0 ]; do |
185 | gcc-sysroot) | 185 | gcc-sysroot) |
186 | CFG_GCC_SYSROOT="$VAL" | 186 | CFG_GCC_SYSROOT="$VAL" |
187 | ;; | 187 | ;; |
@@ -192,7 +192,7 @@ index f833869..0d5cae0 100755 | |||
192 | bindir) | 192 | bindir) |
193 | QT_INSTALL_BINS="$VAL" | 193 | QT_INSTALL_BINS="$VAL" |
194 | ;; | 194 | ;; |
195 | @@ -1433,6 +1456,11 @@ while [ "$#" -gt 0 ]; do | 195 | @@ -1449,6 +1472,11 @@ while [ "$#" -gt 0 ]; do |
196 | DEV_VAL=`echo $VAL | cut -d '=' -f 2-` | 196 | DEV_VAL=`echo $VAL | cut -d '=' -f 2-` |
197 | DeviceVar set $DEV_VAR "$DEV_VAL" | 197 | DeviceVar set $DEV_VAR "$DEV_VAL" |
198 | ;; | 198 | ;; |
@@ -204,7 +204,7 @@ index f833869..0d5cae0 100755 | |||
204 | qpa) | 204 | qpa) |
205 | QT_QPA_DEFAULT_PLATFORM="$VAL" | 205 | QT_QPA_DEFAULT_PLATFORM="$VAL" |
206 | ;; | 206 | ;; |
207 | @@ -2683,6 +2711,8 @@ Additional options: | 207 | @@ -2699,6 +2727,8 @@ Additional options: |
208 | -device-option <key=value> ... Add device specific options for the device mkspec | 208 | -device-option <key=value> ... Add device specific options for the device mkspec |
209 | (experimental) | 209 | (experimental) |
210 | 210 | ||
@@ -213,7 +213,7 @@ index f833869..0d5cae0 100755 | |||
213 | * -no-separate-debug-info . Do not store debug information in a separate file. | 213 | * -no-separate-debug-info . Do not store debug information in a separate file. |
214 | -separate-debug-info .... Strip debug information into a separate file. | 214 | -separate-debug-info .... Strip debug information into a separate file. |
215 | 215 | ||
216 | @@ -2714,6 +2744,9 @@ Additional options: | 216 | @@ -2730,6 +2760,9 @@ Additional options: |
217 | -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths. | 217 | -sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths. |
218 | -no-gcc-sysroot ..... When using -sysroot, it disables the passing of --sysroot to the compiler | 218 | -no-gcc-sysroot ..... When using -sysroot, it disables the passing of --sysroot to the compiler |
219 | 219 | ||
@@ -223,7 +223,7 @@ index f833869..0d5cae0 100755 | |||
223 | -no-feature-<feature> Do not compile in <feature>. | 223 | -no-feature-<feature> Do not compile in <feature>. |
224 | -feature-<feature> .. Compile in <feature>. The available features | 224 | -feature-<feature> .. Compile in <feature>. The available features |
225 | are described in src/corelib/global/qfeatures.txt | 225 | are described in src/corelib/global/qfeatures.txt |
226 | @@ -3280,7 +3313,7 @@ if [ -d "$XPLATFORM" ]; then | 226 | @@ -3296,7 +3329,7 @@ if [ -d "$XPLATFORM" ]; then |
227 | else | 227 | else |
228 | XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}" | 228 | XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}" |
229 | fi | 229 | fi |
@@ -232,17 +232,17 @@ index f833869..0d5cae0 100755 | |||
232 | QT_CROSS_COMPILE=yes | 232 | QT_CROSS_COMPILE=yes |
233 | QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" | 233 | QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" |
234 | QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile" | 234 | QTCONFIG_CONFIG="$QTCONFIG_CONFIG cross_compile" |
235 | @@ -4059,7 +4092,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 235 | @@ -4069,7 +4102,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
236 | EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS" | 236 | EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)" |
237 | done | ||
238 | fi | 237 | fi |
238 | |||
239 | - if [ "$BUILD_ON_MSYS" = "yes" ]; then | 239 | - if [ "$BUILD_ON_MSYS" = "yes" ]; then |
240 | + case `basename "$PLATFORM"` in | 240 | + case `basename "$PLATFORM"` in |
241 | + win32-g++*) | 241 | + win32-g++*) |
242 | EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE" | 242 | EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE" |
243 | EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE" | 243 | EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE" |
244 | EXTRA_OBJS="qfilesystemengine_win.o \ | 244 | EXTRA_OBJS="qfilesystemengine_win.o \ |
245 | @@ -4078,7 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 245 | @@ -4088,7 +4122,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
246 | \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\"" | 246 | \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\"" |
247 | EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32" | 247 | EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32" |
248 | EXEEXT=".exe" | 248 | EXEEXT=".exe" |
@@ -252,7 +252,7 @@ index f833869..0d5cae0 100755 | |||
252 | EXTRA_OBJS="qfilesystemengine_unix.o \ | 252 | EXTRA_OBJS="qfilesystemengine_unix.o \ |
253 | qfilesystemiterator_unix.o \ | 253 | qfilesystemiterator_unix.o \ |
254 | qfsfileengine_unix.o \ | 254 | qfsfileengine_unix.o \ |
255 | @@ -4088,8 +4123,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 255 | @@ -4098,8 +4133,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
256 | \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ | 256 | \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ |
257 | \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" | 257 | \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" |
258 | EXEEXT= | 258 | EXEEXT= |
@@ -263,15 +263,15 @@ index f833869..0d5cae0 100755 | |||
263 | if [ "$BUILD_ON_MAC" = "yes" ]; then | 263 | if [ "$BUILD_ON_MAC" = "yes" ]; then |
264 | echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" | 264 | echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" |
265 | echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" | 265 | echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" |
266 | @@ -4110,6 +4145,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 266 | @@ -4117,6 +4152,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
267 | if [ '!' -z "$D_FLAGS" ]; then | 267 | \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \ |
268 | EXTRA_CFLAGS="$EXTRA_CFLAGS $D_FLAGS" | 268 | \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\"" |
269 | fi | 269 | fi |
270 | + | 270 | + |
271 | echo >>"$mkfile" | 271 | echo >>"$mkfile" |
272 | adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` | 272 | adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` |
273 | adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` | 273 | adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` |
274 | @@ -4179,7 +4215,81 @@ QTCONFFILE="$outpath/bin/qt.conf" | 274 | @@ -4186,7 +4222,81 @@ QTCONFFILE="$outpath/bin/qt.conf" |
275 | cat > "$QTCONFFILE" <<EOF | 275 | cat > "$QTCONFFILE" <<EOF |
276 | [EffectivePaths] | 276 | [EffectivePaths] |
277 | Prefix=.. | 277 | Prefix=.. |
@@ -353,7 +353,7 @@ index f833869..0d5cae0 100755 | |||
353 | if [ x"$relpath" != x"$outpath" ]; then | 353 | if [ x"$relpath" != x"$outpath" ]; then |
354 | cat >> "$QTCONFFILE" <<EOF | 354 | cat >> "$QTCONFFILE" <<EOF |
355 | [EffectiveSourcePaths] | 355 | [EffectiveSourcePaths] |
356 | @@ -4187,6 +4297,9 @@ Prefix=$relpath | 356 | @@ -4194,6 +4304,9 @@ Prefix=$relpath |
357 | EOF | 357 | EOF |
358 | fi | 358 | fi |
359 | 359 | ||
@@ -363,7 +363,7 @@ index f833869..0d5cae0 100755 | |||
363 | #------------------------------------------------------------------------------- | 363 | #------------------------------------------------------------------------------- |
364 | # write out device config before we run the test. | 364 | # write out device config before we run the test. |
365 | #------------------------------------------------------------------------------- | 365 | #------------------------------------------------------------------------------- |
366 | @@ -4199,9 +4312,20 @@ else | 366 | @@ -4206,9 +4319,20 @@ else |
367 | fi | 367 | fi |
368 | 368 | ||
369 | #------------------------------------------------------------------------------- | 369 | #------------------------------------------------------------------------------- |
@@ -385,7 +385,7 @@ index f833869..0d5cae0 100755 | |||
385 | if [ $? != "0" ]; then | 385 | if [ $? != "0" ]; then |
386 | echo "Failed to process makespec for platform '$XPLATFORM'" | 386 | echo "Failed to process makespec for platform '$XPLATFORM'" |
387 | if [ "$OPT_VERBOSE" = "yes" ]; then | 387 | if [ "$OPT_VERBOSE" = "yes" ]; then |
388 | @@ -4217,7 +4341,7 @@ fi | 388 | @@ -4224,7 +4348,7 @@ fi |
389 | #------------------------------------------------------------------------------- | 389 | #------------------------------------------------------------------------------- |
390 | if [ -z "$PKG_CONFIG" ]; then | 390 | if [ -z "$PKG_CONFIG" ]; then |
391 | # See if PKG_CONFIG is set in the mkspec: | 391 | # See if PKG_CONFIG is set in the mkspec: |
@@ -394,7 +394,7 @@ index f833869..0d5cae0 100755 | |||
394 | [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG" | 394 | [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG" |
395 | fi | 395 | fi |
396 | if [ -z "$PKG_CONFIG" ]; then | 396 | if [ -z "$PKG_CONFIG" ]; then |
397 | @@ -4292,7 +4416,7 @@ compileTest() | 397 | @@ -4299,7 +4423,7 @@ compileTest() |
398 | if [ "$CFG_SHARED" = "no" ]; then | 398 | if [ "$CFG_SHARED" = "no" ]; then |
399 | test_config="$QMAKE_CONFIG static" | 399 | test_config="$QMAKE_CONFIG static" |
400 | fi | 400 | fi |
@@ -403,7 +403,7 @@ index f833869..0d5cae0 100755 | |||
403 | } | 403 | } |
404 | 404 | ||
405 | compileTestWithPkgConfig() | 405 | compileTestWithPkgConfig() |
406 | @@ -4341,7 +4465,7 @@ compileTestWithPkgConfig() | 406 | @@ -4348,7 +4472,7 @@ compileTestWithPkgConfig() |
407 | 407 | ||
408 | # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is | 408 | # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is |
409 | OUTFILE=$outpath/arch.result | 409 | OUTFILE=$outpath/arch.result |
@@ -412,7 +412,7 @@ index f833869..0d5cae0 100755 | |||
412 | if [ $? -eq 0 ]; then | 412 | if [ $? -eq 0 ]; then |
413 | eval `cat "$OUTFILE"` | 413 | eval `cat "$OUTFILE"` |
414 | else | 414 | else |
415 | @@ -4354,7 +4478,7 @@ rm -f "$OUTFILE" 2>/dev/null | 415 | @@ -4361,7 +4485,7 @@ rm -f "$OUTFILE" 2>/dev/null |
416 | 416 | ||
417 | if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then | 417 | if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then |
418 | # Do the same test again, using the host compiler | 418 | # Do the same test again, using the host compiler |
@@ -421,7 +421,7 @@ index f833869..0d5cae0 100755 | |||
421 | if [ $? -eq 0 ]; then | 421 | if [ $? -eq 0 ]; then |
422 | eval `cat "$OUTFILE"` | 422 | eval `cat "$OUTFILE"` |
423 | else | 423 | else |
424 | @@ -4570,7 +4694,7 @@ fi | 424 | @@ -4577,7 +4701,7 @@ fi |
425 | 425 | ||
426 | # detect mips_dsp support | 426 | # detect mips_dsp support |
427 | if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then | 427 | if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then |
@@ -430,7 +430,7 @@ index f833869..0d5cae0 100755 | |||
430 | CFG_MIPS_DSP=yes | 430 | CFG_MIPS_DSP=yes |
431 | else | 431 | else |
432 | CFG_MIPS_DSP=no | 432 | CFG_MIPS_DSP=no |
433 | @@ -4581,7 +4705,7 @@ fi | 433 | @@ -4588,7 +4712,7 @@ fi |
434 | 434 | ||
435 | # detect mips_dspr2 support | 435 | # detect mips_dspr2 support |
436 | if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then | 436 | if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then |
@@ -439,7 +439,7 @@ index f833869..0d5cae0 100755 | |||
439 | CFG_MIPS_DSPR2=yes | 439 | CFG_MIPS_DSPR2=yes |
440 | else | 440 | else |
441 | CFG_MIPS_DSPR2=no | 441 | CFG_MIPS_DSPR2=no |
442 | @@ -7471,7 +7595,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null | 442 | @@ -7482,7 +7606,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null |
443 | cd .. | 443 | cd .. |
444 | fi | 444 | fi |
445 | 445 | ||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d0809c31..c99eddd2 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -123,7 +123,6 @@ PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" | |||
123 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" | 123 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" |
124 | PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" | 124 | PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" |
125 | PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" | 125 | PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" |
126 | PACKAGECONFIG[nis] = "-nis,-no-nis" | ||
127 | PACKAGECONFIG[widgets] = "-widgets,-no-widgets" | 126 | PACKAGECONFIG[widgets] = "-widgets,-no-widgets" |
128 | PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" | 127 | PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" |
129 | PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" | 128 | PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" |
@@ -249,4 +248,4 @@ sysroot_stage_dirs_append() { | |||
249 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} | 248 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} |
250 | } | 249 | } |
251 | 250 | ||
252 | SRCREV = "cec15a89d058424794978910cc8da65b43d71606" | 251 | SRCREV = "6bcd27b957a5ffcfe7665b0979679510e3b2ae3d" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 5b12d1a7..b28bab0c 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b" | 13 | SRCREV = "1a19a68e76205650b55fea48477deb95bf328412" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 03990d85..a4686729 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 | ||
28 | SRCREV = "dedff12a896d51c469d2af82664b86a10f8fa7fe" | 28 | SRCREV = "a084e2160a345162681af984d9c265f619be7124" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index fb957bb5..f44be8b6 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -39,6 +39,6 @@ do_install_append_class-nativesdk() { | |||
39 | 39 | ||
40 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 40 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
41 | 41 | ||
42 | SRCREV = "26ff8f9029107877bfbfdc2f099f9b11861183ed" | 42 | SRCREV = "dbf7efde1e04ac0ff445f64438078d87eb035b68" |
43 | 43 | ||
44 | BBCLASSEXTEND =+ "native nativesdk" | 44 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb index 04f5a79d..0f37e9a5 100644 --- a/recipes-qt/qt5/qtenginio_git.bb +++ b/recipes-qt/qt5/qtenginio_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | 12 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
13 | 13 | ||
14 | SRCREV = "cf717b99fdb1b7221dd556bf3be32feba0ed8afe" | 14 | SRCREV = "d5aec18177acc122b0b7c39a90fbb09d388a01b3" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 606b873a..9e2d5e6d 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative" | |||
17 | 17 | ||
18 | RDEPENDS_${PN}-dev = "" | 18 | RDEPENDS_${PN}-dev = "" |
19 | 19 | ||
20 | SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf" | 20 | SRCREV = "35179f6b3116f1cee4586faa7c4f751e6d2e00af" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 573b3303..9cc7a3c7 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+ | |||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
30 | 30 | ||
31 | SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f" | 31 | SRCREV = "6415dae76eb8586f6e520961a76996df2425476d" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8a41551b..b6f6af0b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -29,4 +29,4 @@ do_configure_prepend() { | |||
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
31 | 31 | ||
32 | SRCREV = "d1f66746ab0b77b4f3300cbeeaafe61d25d78e98" | 32 | SRCREV = "f897775850dfbe0e668e9c8b428537e8bb096c01" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 328fdd74..5c176d07 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 | ||
38 | SRCREV = "2170a3b0fcda613daf76a337fa45cb97e0714cdf" | 38 | SRCREV = "6d5f375644624b977b168928ae09227a9d28547f" |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 61b02a17..d5239749 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 | ||
26 | SRCREV = "563ce3888f3c04abcc96ba236b20c7a822bc88e2" | 26 | SRCREV = "212653fea189ad1f5203fe2b5c12caba6f13c72a" |
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch index c57943d9..9ad92a1c 100644 --- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d5faf29f8a41b0e28132fb23828cff8043174cb8 Mon Sep 17 00:00:00 2001 | 1 | From 00bb7694b9287f23d4d059ae134e9409db69673e Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Thu, 31 Mar 2016 19:57:01 -0400 | 3 | Date: Thu, 31 Mar 2016 19:57:01 -0400 |
4 | Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' | 4 | Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' |
@@ -7,14 +7,14 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | 8 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> |
9 | --- | 9 | --- |
10 | examples/quick/controls/texteditor/src/documenthandler.cpp | 1 + | 10 | examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 + |
11 | 1 file changed, 1 insertion(+) | 11 | 1 file changed, 1 insertion(+) |
12 | 12 | ||
13 | diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp | 13 | diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
14 | index 2e03f74..3d1b3c8 100644 | 14 | index bdecf5b..811a761 100644 |
15 | --- a/examples/quick/controls/texteditor/src/documenthandler.cpp | 15 | --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
16 | +++ b/examples/quick/controls/texteditor/src/documenthandler.cpp | 16 | +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp |
17 | @@ -44,6 +44,7 @@ | 17 | @@ -54,6 +54,7 @@ |
18 | #include <QtGui/QTextCursor> | 18 | #include <QtGui/QTextCursor> |
19 | #include <QtGui/QFontDatabase> | 19 | #include <QtGui/QFontDatabase> |
20 | #include <QtCore/QFileInfo> | 20 | #include <QtCore/QFileInfo> |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e3c580fe..22316297 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative" | |||
12 | 12 | ||
13 | FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" | 13 | FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" |
14 | 14 | ||
15 | SRCREV = "ac152bfcd37f94453e9705b57ca6520ad30bade0" | 15 | SRCREV = "f3212709f2cb19f61f09ba551934101800586d1a" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 7a5ca233..0912169f 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ SRC_URI += " \ | |||
17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "01e52200e2a76ec51c3bb9710617ac0c249a78bc" | 20 | SRCREV = "7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 565ca843..d3d421fb 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 | ||
28 | DEPENDS += "qtbase" | 28 | DEPENDS += "qtbase" |
29 | 29 | ||
30 | SRCREV = "b16873afea798d08799d7a0b255b8d200337f35b" | 30 | SRCREV = "76b5b0c3598a595c61f0cb274b392feeaf3e8dc3" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 16c20956..4d6dfa88 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase qtdeclarative" | 16 | DEPENDS += "qtbase qtdeclarative" |
17 | 17 | ||
18 | SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e" | 18 | SRCREV = "6189199557a2b8eb981f37e6370b47c25b224b4e" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 4139db1f..d2dd424f 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478" | 18 | SRCREV = "9c9255eda50af191636ff9f18df35567c307dd8c" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 6c300e5b..49b7c38f 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "e02df9c098b4d304b34c0ff65806a0576e45ed1a" | 16 | SRCREV = "600ae02bce34b5cd56c1ddc99553bf661ae96b1a" |
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 8cbe0e0c..656895ef 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 | ||
36 | SRCREV = "236b6b544fd2049eb46e8f79d13bb7aa35ba002f" | 36 | SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index e0b23b4b..bc06d7fa 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
33 | 33 | ||
34 | SRCREV = "e33532e048fa12ee32429ca83ee31aa8f065147d" | 34 | SRCREV = "ec575c44637744413b106388cd0ed1d399fc7871" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 93b147d8..0f30e9b6 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ | |||
114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ | 114 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ |
115 | " | 115 | " |
116 | 116 | ||
117 | SRCREV = "13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f" | 117 | SRCREV = "674d2ca9f7c51f3621c9e2b36c9f02528dd23d40" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 1fd51685..6122db41 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 | ||
28 | SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" | 28 | SRCREV = "d9132f078bb168a9a013b97493c219596cc8c6b2" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a1cee864..63913b57 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -36,4 +36,4 @@ SRC_URI += " \ | |||
36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ | 36 | file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ |
37 | " | 37 | " |
38 | 38 | ||
39 | SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2" | 39 | SRCREV = "d9132f078bb168a9a013b97493c219596cc8c6b2" |
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 79c6b23f..7288b0ad 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtdeclarative qtwebsockets" | 16 | DEPENDS += "qtdeclarative qtwebsockets" |
17 | 17 | ||
18 | SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498" | 18 | SRCREV = "bec50124b893c4632829d9806f49f64c4debf936" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index bc358ef5..a20c0b7f 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -119,8 +119,8 @@ SRC_URI += " \ | |||
119 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 119 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
120 | " | 120 | " |
121 | 121 | ||
122 | SRCREV_qtwebengine = "643aa579fc94933eefa8eb20af6729e2140cf480" | 122 | SRCREV_qtwebengine = "f531565348e550bc2e03917874009331556f0d66" |
123 | SRCREV_chromium = "8252b18aa3efa52138e91f9756945afb142a1c8c" | 123 | SRCREV_chromium = "19e3d1d3af80efee4377a4e5fcb9c214dba5be4e" |
124 | SRCREV = "${SRCREV_qtwebengine}" | 124 | SRCREV = "${SRCREV_qtwebengine}" |
125 | 125 | ||
126 | SRCREV_FORMAT = "qtwebengine_chromium" | 126 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 933220de..3f1ab500 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb | |||
@@ -19,4 +19,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" | |||
19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" | 19 | RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" |
20 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" | 20 | RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" |
21 | 21 | ||
22 | SRCREV = "1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34" | 22 | SRCREV = "2a143bf81b2ffb3bd7a5f47cf719e6ed347bf383" |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index eb05ce24..753246a2 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -71,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
73 | 73 | ||
74 | SRCREV = "71136c9621103522e85654c8e144d5f1c961de1c" | 74 | SRCREV = "da5f9d788f96340a44083ed4e28cdf6ea0a393f0" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 66d9d741..f289d26e 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "ba9306ec5a1271275d79b2f48ceb227f79352f33" | 14 | SRCREV = "10cad9ece2cb380e26e03a1c03b900f8e3b4c801" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index d8beb500..ce9e4541 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "f27489d66cc6d8263130451c26c7e4ae40acc6b4" | 16 | SRCREV = "36ae961b08420f14d7ad52ee5dc23ea456accfd9" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d78df146..9008d700 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "5e6acdb2ea92add793835561e7a2d6b0ed8890f8" | 16 | SRCREV = "64e5f2be2ba63aa1ed04291dc529f2b8edee9a0b" |
17 | 17 | ||
18 | BBCLASSEXTEND =+ "native nativesdk" | 18 | BBCLASSEXTEND =+ "native nativesdk" |