summaryrefslogtreecommitdiffstats
path: root/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* replace base_contains by bb.utils.containsAndreas Müller2016-05-029-34/+34
| | | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.6 branchMartin Jansa2016-04-2162-268/+108
| | | | | | | | | | | | | | * qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch and qtwebkit/0004-Fix-linking-with-libpthread.patch were resolved upstream * all patches were refreshed with: git format-patch --no-numbered --no-signature -NUMBER to remove numbering from Subject (it's good enough in filename) and to remove git version from signature (so it doesn't look differently when generated on different hosts with different git version). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: set SRCREVs,PVs to 5.6.0Andreas Müller2016-04-2030-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtquick1: LICENSE.LGPLv3: I checked git repository. To be honest: I have no idea what caused checksum change. JaMa: it was modified in this change: OE @ ~/projects/qt-project/qtquick1 $ git log --oneline 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141..dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 -- LICENSE.LGPLv3 cd50897 Add the GPLv3 license text diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 8fbb743..4d67bac 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -5,6 +5,8 @@ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. + This license makes reference to the version 3 of the GNU General + Public License, which you can find in the LICENSE.GPLv3 file. * in some cases this is actually older SRCREV than what was used before (because normally the recipes use latest revision in stable - e.g. 5.6 branches, not the actuall tags). I'll upgrade to latest 5.6 revisions in follow-up commit (together with refreshing the .patch files and github.com/meta-qt5/qt* repositories to apply cleanly) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquickcontrols: fix compilation of examples/texteditorDenys Dmytriyenko2016-04-202-0/+31
| | | | | | | | git/examples/quick/controls/texteditor/src/documenthandler.cpp:136:12: error: invalid use of incomplete type 'class QDebug' qDebug() << "saved to" << localPath; Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative: fix compilation of examples/qquickviewcomparisonDenys Dmytriyenko2016-04-202-0/+29
| | | | | | | | git/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp:180:14: error: 'QCoreApplication' has not been declared if (!QCoreApplication::arguments().contains(QStringLiteral("--no_render_alpha"))) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* quazip: update to 0.7.2Jonathan Liu2016-04-201-2/+2
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquickcontrols2: initial add 5.6.0Andreas Müller2016-04-201-0/+15
| | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
* recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONFMartin Jansa2016-04-208-12/+12
| | | | | | | | | | | | * this fixes builds for DISTROs which include no-static-libraries.inc * this change depends on oe-core change: http://patchwork.openembedded.org/patch/116719/ which was merged in this form: http://patchwork.openembedded.org/patch/120513/ to Yocto 2.1, if you want to use latest meta-qt5 with older oe-core you need to append EXTRA_OECONF to PACKAGECONFIG_CONFARGS Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: enable ARMv7VE supportJonathan Liu2016-03-071-0/+1
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* libconnman-qt5: update to 1.0.98Jonathan Liu2016-02-271-2/+2
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: backport patch to fix linking with qtwebkitJonathan Liu2016-02-272-0/+34
| | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* libconnman-qt5: remove blacklistJonathan Liu2016-02-271-2/+0
| | | | | | | | The package no longer fails sanity test because of connman-qt5.pc containing references to build host paths. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix up pkgconfig replacementsJonathan Liu2016-02-271-29/+27
| | | | | | | | | | | | | | The replacements were being done in qt_module.prf which is not included when building 3rd party libraries. To resolve this, move the replacements from qt_module.prf to qt.prf which is included when building any qmake project. The pkgconfig include replacement is removed as it doesn't seem to be needed anymore and causes issues when the includedir path in pkgconfig has part of its path replaced with ${includedir} resulting in a circular reference that causes the OE package_do_pkgconfig task to fail. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add runtime dependency to xkeyboard-configSamuli Piippo2016-02-251-1/+1
| | | | | | | | When qtbase is configured with xkbcommon-evdev (usually without X), make sure xkeyboard-config is installed to provide keymap database. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* libconnman-qt5: Blacklist because of connman-qt5.pcMartin Jansa2016-02-241-0/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: skip libdir for ${PN}-dbg and dev-elf for ${PN}-examples-devMartin Jansa2016-02-201-1/+2
| | | | | | * the examples are installed in locations, QA checks don't like Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: upgrade SRCREVs a bit moreMartin Jansa2016-02-2013-20/+20
| | | | | | * to make sure that qtbase modules report 4.6.1 version Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* nativesdk-qtbase: use runtime linked dbusSamuli Piippo2016-02-201-1/+2
| | | | | | | | Remove direct dependency to nativesdk-dbus. Instead configure qtbase to use runtime linked dbus library, if that is found. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qttransltations: Add PACKAGE for qtwebengine and qtquickcontrols2Martin Jansa2016-02-201-0/+10
| | | | | | | | | | | | | | | * fixes QA warning: WARNING: qttranslations-5.5.99+5.6.0-rc+gitAUTOINC+ce85e4ee4e-r0 do_package: QA Issue: qttranslations: Files/directories were installed but not shipped in any package: /usr/share/qt5/translations/qtquickcontrols2_uk.qm /usr/share/qt5/translations/qtwebengine_de.qm /usr/share/qt5/translations/qtwebengine_ru.qm /usr/share/qt5/translations/qtwebengine_uk.qm /usr/share/qt5/translations/qtwebengine_en.qm Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. qttranslations: 5 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: Hide textrel QA warning until there is proper fix for itMartin Jansa2016-02-201-0/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: Fix QA warningMartin Jansa2016-02-201-0/+1
| | | | | | | | * drop section with list of static libraries in workdir * feel free to fix it properly in Qt build, I need quick hack to unblock my bitbake world builds Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Fix QA WarningMartin Jansa2016-02-201-0/+6
| | | | | | | | | | * there are multiple -L paths to workdir, causing QA warning like this: ERROR: qtwebkit-5.5.99+5.6.0-rc+gitAUTOINC+d2ff5a0855-r0 do_populate_sysroot: QA Issue: Qt5WebKit.pc failed sanity test (tmpdir) in path qtwebkit/5.5.99+5.6.0-rc+gitAUTOINC+d2ff5a0855-r0/sysroot-destdir//usr/lib/pkgconfig [pkgconfig] * qtwebkit is dead, so hack it with simple sed, feel free to fix it in mkspecs if you want Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* examples: fix few thousands host-user-contaminated QA warningsMartin Jansa2016-02-209-21/+21
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Don't install libQt* files twiceMartin Jansa2016-02-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * they are installed by make correctly (at least with latest 5.6 revisions) * I wanted to remove .la files (in qmake5_base_do_install) and this copies them back to ${D} which is annoying. So I've removed this cp line and checked what gets missing and it turns out that nothing important is missing and even more importantly the fixed *prl files are overwritten with their original version. OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase $ diff -rq 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0*/image Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Bootstrap.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5BootstrapDBus.a Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5BootstrapDBus.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5BootstrapDBus.prl Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Concurrent.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Core.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5DBus.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Gui.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Network.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5OpenGL.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5OpenGLExtensions.la Files 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib/libQt5OpenGLExtensions.prl and 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0/image/usr/lib/libQt5OpenGLExtensions.prl differ Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5PlatformSupport.la Files 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib/libQt5PlatformSupport.prl and 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0/image/usr/lib/libQt5PlatformSupport.prl differ Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5PrintSupport.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Sql.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Test.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Widgets.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5XcbQpa.la Only in 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib: libQt5Xml.la OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase $ diff -uNr 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib/libQt5OpenGLExtensions.prl 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0/image/usr/lib/libQt5OpenGLExtensions.prl --- 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib/libQt5OpenGLExtensions.prl 2016-02-17 22:34:16.397812156 +0100 +++ 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0/image/usr/lib/libQt5OpenGLExtensions.prl 2016-02-17 22:38:56.637811683 +0100 @@ -3,4 +3,4 @@ QMAKE_PRL_TARGET = libQt5OpenGLExtensions.a QMAKE_PRL_CONFIG = silent lex yacc depend_includepath testcase_targets import_plugins import_qpa_plugin qt warn_on release link_prl incremental cross_compile qpa no_mocdepend release qt_no_framework linux unix posix \$(OE_QMAKE_COMPILER) gcc cross_compile compile_examples qpa largefile use_gold_linker sse2 sse3 ssse3 sse4_1 sse4_2 avx avx2 pcre prefix_build force_independent force_bootstrap create_prl link_prl prepare_docs qt_docs_targets no_private_qt_headers_warning QTDIR_build exceptions_off testcase_exceptions qt_example_installs warning_clean c++11 static opengl relative_qt_rpath git_build qmake_cache target_qt c++11 strict_c++ c++14 c++1z hide_symbols bsymbolic_functions qt_install_headers need_fwd_pri qt_install_module create_cmake compiler_supports_fpmath create_pc create_libtool have_target staticlib thread opengl moc resources QMAKE_PRL_VERSION = 5.6.0 -QMAKE_PRL_LIBS = -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0/build/lib -lQt5Gui -lQt5Core -lpthread -lGL +QMAKE_PRL_LIBS = -lQt5Gui -lQt5Core -lpthread -lGL OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase $ diff -uNr 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib/libQt5PlatformSupport.prl 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0/image/usr/lib/libQt5PlatformSupport.prl --- 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0.orig/image/usr/lib/libQt5PlatformSupport.prl 2016-02-17 22:34:16.438812156 +0100 +++ 5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0/image/usr/lib/libQt5PlatformSupport.prl 2016-02-17 22:38:56.969811683 +0100 @@ -3,4 +3,4 @@ QMAKE_PRL_TARGET = libQt5PlatformSupport.a QMAKE_PRL_CONFIG = silent lex yacc depend_includepath testcase_targets import_plugins import_qpa_plugin qt warn_on release link_prl incremental cross_compile qpa no_mocdepend release qt_no_framework linux unix posix \$(OE_QMAKE_COMPILER) gcc cross_compile compile_examples qpa largefile use_gold_linker sse2 sse3 ssse3 sse4_1 sse4_2 avx avx2 pcre prefix_build force_independent force_bootstrap create_prl link_prl prepare_docs qt_docs_targets no_private_qt_headers_warning QTDIR_build exceptions_off testcase_exceptions qt_example_installs warning_clean c++11 static internal_module egl opentype qpa/genericunixfontdatabase relative_qt_rpath git_build qmake_cache target_qt c++11 strict_c++ c++14 c++1z hide_symbols bsymbolic_functions qt_install_headers need_fwd_pri qt_install_module compiler_supports_fpmath create_libtool have_target staticlib qpa/basicunixfontdatabase thread opengl dbusadaptors dbusinterfaces moc resources QMAKE_PRL_VERSION = 5.6.0 -QMAKE_PRL_LIBS = -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.5.99+5.6.0-rc+gitAUTOINC+ac8a3b948d-r0/build/lib -lQt5Gui -lQt5DBus -lQt5Core -lpthread -lgthread-2.0 -pthread -lglib-2.0 -lqtfreetype -lz -lpng -lXrender -lXext -lX11 -lm -ludev -lEGL -lGL +QMAKE_PRL_LIBS = -lQt5Gui -lQt5DBus -lQt5Core -lpthread -lgthread-2.0 -pthread -lglib-2.0 -lqtfreetype -lz -lpng -lXrender -lXext -lX11 -lm -ludev -lEGL -lGL Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Resolve QA warning about /bin/bash dependencyMartin Jansa2016-02-201-0/+2
| | | | | | | | | * WARNING: QA Issue: /usr/lib/qt5/mkspecs/features/data/mac/objc@underscore@namespace.sh_qtbase-mkspecs contained in package qtbase-mkspecs requires /bin/bash, but no providers found in its RDEPENDS [file-rdeps] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix WORKDIR references in pkg-config filesMartin Jansa2016-02-201-6/+11
| | | | | | | | | | | * otherwise all builds fail with: ERROR: QA Issue: Qt5Core.pc failed sanity test (tmpdir) in path qtbase/5.5.99+5.6.0-alpha1+gitAUTOINC+f7f4dde80e-r0/sysroot-destdir//usr/lib/pkgconfig [pkgconfig] since oe-core insane.bbclass was fixed to properly search for tmpdir in all pkg-config files. * this issue was there for long time, I've checked the build with jethro branch and it already has prefix=<TOPDIR>/tmp-glibc/sysroots/qemux86/usr it just wasn't detected by QA checks until now
* qt5: upgrade to latest revisions in 5.6 branch (5.6 RC)Martin Jansa2016-02-2060-208/+207
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5_base: delete *.la filesMartin Jansa2016-02-172-2/+2
| | | | | | | | | | | | * they reference workdir and trip sanity check: ERROR: QA Issue: libQt5Sql.la failed sanity test (workdir) in path qtbase/5.5.99+5.6.0-alpha1+gitAUTOINC+f7f4dde80e-r0/sysroot-destdir//usr/lib [la] * I'm intentionally not using remove-libtool.bbclass recently added to oe-core, because many people combine newer meta-qt5 with older oe-core and can be missing this bbclass, I've pending patch to migrate this to remove-libtool.bbclass, will probably merge it after 2.1 or 2.2 release. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: add Qml support to lupdateSamuli Piippo2016-02-143-20/+4
| | | | | | | | | | | Add dependency to qtdeclarative to qttools' native and nativesdk builds. This gives us lupdate with a support for Qml files. The nativesdk builds of qtdeclarative depend on more modules (Xml, Sql) from nativesdk-qtbase, so preserve all libs that are already built. This brings few extra libs to the package that might not be needed, but keeps the recipe simpler. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt3d: support qgltf in native and nativesdk buildsSamuli Piippo2016-02-142-1/+46
| | | | | | | qgltf is used to import a variety of 3D model formats and export into fast-to-load, optimized glTF assets embedded into Qt resource files Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: use common PACKAGECONFIG to build examplesSamuli Piippo2016-02-084-34/+4
| | | | | | | | | | | | | | Each Qt module's examples can now be enabled with PACKAGECONFIG. Replace the webkit patch with a PACKAGECONFIG option and follow common practice by not building QtWayland examples by default, those can be enabled in a .bbappend with PACKAGECONFIG += "examples" Enabling PACKAGECONFIG[examples] in qtbase, will still cause every Qt module to build their examples. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-git.inc: Ensure we export the SRCREV as the module nameOtavio Salvador2016-02-081-2/+2
| | | | | | | | | For components which use multiple Git repositories (e.g QtWebEngine) it is important to have the module name exported so it can be referred in SRCREV_FORMAT. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Fix installation of fonts and librariesSimon Aittamaa2016-02-011-2/+2
| | | | | | | | | | | | | | | This patch fixes three problems 1) Running on a case-sensitive system would result in an error due to invalid casing of pattern to install. 2) Using install on symlinks would cause multiple copies of the same file to be installed on the target-system, since install doesn't preserve symlinks. This wastes a lot of space and it causes ldconfig to complain about non-symlinked files. 3) Leakage of user-ids, i.e. cp -a would preserve the uid/gid of whoever built the files, which is usually not what you want. Signed-off-by: Simon Aittamaa <simon.aittamaa@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: use PACKAGECONFIG to ensure runtime dependency to libsslSamuli Piippo2016-01-141-2/+1
| | | | | | | | | | | | | | Using openssl-linked configure has side effect that gdb catches the SIGILL signal, which openssl uses internally on ARM, every time when starting debugging any Qt application. This is annoying and somewhat confusing behavior even with QtCreator. Using the default openssl configure argument prevents this, while using the 4th argument for PACKAGECONFIG keeps the runtime dependency to libssl correctly in place. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: re-enable replacing host paths in qconfig.priSamuli Piippo2016-01-141-3/+3
| | | | | | | | | Uncomment code that replaces host paths with qmake built-in properties in qconfig.pri. Modified to replace paths in all *.pri files in mkspecs directory and to also change paths without space in front of it. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: allow overriding git protocol used with QT_GIT uriSamuli Piippo2016-01-141-1/+1
| | | | | | | | Add option QT_GIT_PROTOCOL to specify the protocol to be used with the QT_GIT uri. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtconnectivity, qtsystems: fix bluetooth supportJavier Viguera2016-01-142-6/+12
| | | | | | | | | | | | QMAKE_CACHE_EVAL is only used in qtwebengine and qtwebkit, but not in the rest of the QT5 packages, so use EXTRA_QMAKEVARS_PRE to pass the packageconfig options to the do_configure task. Also generalize bluetooth support so it can be used not only with bluez4 but with bluez5 as well. Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtscript/qtwebkit: disable thumb for armv4 and armv5 only to fix segfault on ↵Andreas Müller2016-01-142-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | armv7 We have a simple application containing a QWebView which segfaulted during loading a page on a CortexA9 (armv7 thumb2). After enabling debug information for qtwebkit and remote debug session the point of segfault was detected in Source/JavaScriptCore/llint/LowLevelInterpreter.asm:1082 callSlowPath(_llint_slow_path_new_func_exp) Further digging around lead to similar source in: * qtwebkit: Source/JavaScriptCore/assembler/ARMv7Assembler.h * qtscript: src/3rdparty/javascriptcore/JavaScriptCore/assembler/ARMv7Assembler.h In these files a class ARMThumbImmediate is declared and used in many places. This lead me to the suspicion that compiligng for armv7 expects thumb support. The following tests were performed: * our application is working fine again * qtscript and qtwebkit were build with 'ARM_INSTRUCTION_SET = "thumb"' => TUNE_FEATURES = "arm armv5 thumb dsp" for qemuarm without issues This is a partial/rebased revert of: commit 932b32c1c9e9a3ac833c82ff9273683345056ec7 Author: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed Apr 22 15:33:01 2015 +0200 qtscript,qtwebking: disable thumb * qemuarm builds fail when thumb is enabled Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: Fix error jpeg_codec.cc, media_capture_devices_dispatcher.cpp ↵Cleiton Bueno2016-01-144-0/+120
| | | | | | | | | | | and file API qquickwebengineview_p_p.h. Fix build codec jpeg_codec.cc error: invalid conversion from 'int' to 'boolean' [-fpermissive], media_capture_devices_dispatcher.cpp error: 'QCoreApplication' has not been declared fix include <QCoreApplication> and file API qquickwebengineview_p_p.h field 'm_backgroundColor' has incomplete type 'QColor' add include <QColor> Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: add extra path to qmlpluginsSamuli Piippo2016-01-141-0/+1
| | | | | | | | | | | QtDeclarative installs file builtins.qmltypes under $$[QT_INSTALL_QML], which was not included in the qmlplugins package. Fix QA Issue: Files/directories were installed but not shipped with qtdeclarative SRCREV 94e9fab2 Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* packagegroup-qt5-toolchain-target: do not check for meta-ruby layerJonathan Liu2015-12-181-2/+2
| | | | | | | | The ruby recipe has been moved into OE-core so checking for the meta-ruby layer is no longer needed as the ruby recipe will always be present. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* align target qmake paths/mkspecAndreas Müller2015-12-156-4/+82
| | | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-creator: building qmldesigner with gcc5 works so enable itAndreas Müller2015-12-151-6/+1
| | | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: overwrite RRECOMMENDS_${PN} for native packagesSamuli Piippo2015-12-151-1/+2
| | | | | | | | | | The class-target overwrite for RRECOMMENDS_${PN} prevented appending new packages to the list in other recipes, without using the class-target overwrite there as well. Instead set RECOMMENDS to empty for native packages, where it is not needed. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add PACKAGECONFIG for xkbcommon-evdevSamuli Piippo2015-12-151-0/+1
| | | | | | | | Add PACKAGECONFIG for xkbcommon-evdev to fix QA Issue: qtbase rdepends on libxkbcommon, but it isn't a build dependency? [build-deps] Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwayland: remove unnecessary header installSamuli Piippo2015-11-121-8/+0
| | | | | | | Installation of the generated headers was fixed in qtbase v5.3.2 Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-creator: upgrade to 3.5.1Martin Jansa2015-11-111-3/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: disable autodetection from sysrootMartin Jansa2015-11-111-0/+24
| | | | | | | | | | | | | * couple dependencies were autodetected from sysroot, e.g.: WARNING: QA Issue: qtwebengine rdepends on libflac, but it isn't a build dependency? [build-deps] * bundled nspr fails to build when system nss is used | work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-alpha1+gitAUTOINC+64dc919d31_7e655fbb76-r0/git/src/3rdparty/chromium/third_party/nss/nspr/pr/include/md/_unixos.h:596:9: error: unknown type name 'off64_t' | typedef off64_t _MDOff64_t; | ^ * addin qtlocation to resolve: WARNING: Failure to find: git/src/core/Release/obj/src/core/QtWebEngineCore.location_provider_qt.o Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: add dependency on yasm-native and use itMartin Jansa2015-11-111-0/+3
| | | | | | | | | | | | | | | * latest chromium is failing to build yasm, because it's mixing native (x86_64) with target (x86 qemux86) libraries during the build: FAILED: /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/i586-oe-linux/i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/sysroots/qemux86 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -Wl,-z,defs -pthread -Wl,-z,noexecstack -fPIC -Wl,--disable-new-dtags -Wl,--gc-sections -o genstring -Wl,--start-group obj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o -Wl,--end-group /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld: i386:x86-64 architecture of input file `obj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o' is incompatible with i386 output /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld: obj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o: file class ELFCLASS64 incompatible with ELFCLASS32 /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld: final link failed: File in wrong format collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. Makefile.gyp_run:262: recipe for target 'invoke_ninja' failed make[3]: *** [invoke_ninja] Error 1 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: fix QMAKE_AR variableMartin Jansa2015-11-111-1/+1
| | | | | | | | | | | | | | * OE_QMAKE_AR is only the tool, qtbase and other modules add correct parameters to it in linux-oe-g++ platform: recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch:+QMAKE_AR = $(OE_QMAKE_AR) cqs but here it was missing "cqs" causing following error at the end of qtwebengine build: i586-oe-linux-ar Release/libqtwebenginecoreapi.a .obj/qwebenginecookiestoreclient.o .obj/qwebengineurlrequestinfo.o .obj/qwebengineurlrequestjob.o .obj/qwebengineurlschemehandler.o .obj/moc_qwebenginecookiestoreclient.o .obj/moc_qwebengineurlrequestinterceptor.o .obj/moc_qwebengineurlrequestjob.o .obj/moc_qwebengineurlschemehandler.o i586-oe-linux-ar: invalid option -- 'R' Usage: i586-oe-linux-ar [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file... ... Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>