Commit Graph

729 Commits

Author SHA1 Message Date
Khem Raj
bf7cdd9630 qtbase-native: Fix qdbuscpp2xml segfault
0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing
qdbuscpp2xml to simply segfault on simple invocation

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:25:56 +02:00
Martin Jansa
932515ad35 qt5-ptest.inc: append do_populate_sysroot only for target
* otherwise it breaks e.g. qtxmlpatterns-native build as shown in:
  http://errors.yoctoproject.org/Errors/Details/147039/

ERROR: Error executing a python function in exec_python_func() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
     0001:
 *** 0002:do_populate_sysroot(d)
     0003:
File: 'TOPDIR/openembedded-core/meta/classes/staging.bbclass', lineno: 128, function: do_populate_sysroot
     0124:
     0125:python do_populate_sysroot_setscene () {
     0126:    sstate_setscene(d)
     0127:}
 *** 0128:addtask do_populate_sysroot_setscene
     0129:
     0130:def staging_copyfile(c, target, dest, postinsts, seendirs):
     0131:    import errno
     0132:
File: 'TOPDIR/openembedded-core/meta/classes/staging.bbclass', lineno: 114, function: copyFiles
     0110:
     0111:do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}"
     0112:do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST"
     0113:
 *** 0114:POPULATESYSROOTDEPS = ""
     0115:POPULATESYSROOTDEPS_class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
     0116:POPULATESYSROOTDEPS_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
     0117:do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}"
     0118:
Exception: FileNotFoundError: [Errno 2] No such file or directory: 'TOPDIR/tmp-glibc/work/x86_64-linux/qtxmlpatterns-native/5.8.0+gitAUTOINC+9f7e01b582-r0/sysroot-destdir/usr/'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:25:33 +02:00
Martin Jansa
c2768bd4e5 qtwebengine: fix build with gcc7
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:25:33 +02:00
Khem Raj
00d72cd892 qwt-qt5: Fix rpath issues
It errors out
usr/plugins/designer/libqwt_designer_plugin.so [rpaths]
QA Issue: qwt-qt5-plugins: found library in wrong location: /usr/plugins/designer/libqwt_designer_plugin.so

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:25:33 +02:00
Steffen Sledz
aa0605d3c7 qtquickcontrols2: fix compilation of examples/texteditor
git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug'
          qWarning() << "load() called before DocumentHandler has QQmlEngine";

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:25:31 +02:00
Huang Qiyu
2c1d6b1e93 qtquick1: add ptest
Add ptest for qttools by using provided testsuite in qtquick1.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:25:04 +02:00
Huang Qiyu
1eac990617 qtdeclarative: add ptest
Add ptest for qttools by using provided testsuite in qtdeclarative.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:25:00 +02:00
Huang Qiyu
ec8c62e06c qtxmlpatterns: add ptest
Add ptest for qttools by using provided testsuite in qtxmlpatterns.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:24:57 +02:00
Huang Qiyu
05455e605b qt5: add qt5-ptest.inc
Add qt5-ptest.inc file for qt ptest related tasks
        1)      Rewrite do_compile_ptest task for qt
        2)      Add new do_compile_ptest_base and task do_install_ptest
        3)      Write do_populate_sysroot_append to resolve do_compile_ptest_base problem in yocto2.3
        The compile error log is shown as follow:
        cd auto/ && ( test -e Makefile || /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-p
oky-linux/qtxmlpatterns/5.8.0+gitAUTOINC+9f7e01b582-r0/recipe-sysroot-native/usr/bin/qt5/qmake -o M
akefile /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-poky-linux/qtxmlpatterns/5.8.0+gitA
UTOINC+9f7e01b582-r0/git/tests/auto/auto.pro ) && make -f Makefile
        Project ERROR: Could not find feature xml-schema.
        Makefile:42: recipe for target 'sub-auto-make_first' failed

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-12 10:24:56 +02:00
Daniel Mack
428be3cc16 qtwebengine: add PACKAGECONFIG for webrtc
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-01 10:07:43 +02:00
Jonathan Liu
800d4c1697 libconnman-qt5: update to 1.1.10
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-07-01 10:07:10 +02:00
Martin Jansa
2940d84215 Revert "qttools: DEPENDS on icu"
This reverts commit 6a42ca074f.

http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113308.html

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-06-27 14:08:49 +02:00
Ming Liu
6a42ca074f qttools: DEPENDS on icu
This fixes a following QA issue:
| QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicui18n, but it isn't a build dependency.
| QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicuuc, but it isn't a build dependency.
| QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicudata, but it isn't a build dependency.

Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-06-22 16:01:19 +02:00
Denys Dmytriyenko
3ae86cb32e qtbase: respect "ld-is-gold" DISTRO_FEATURES
If not set explicitly, some modules like QtWebKit and QtQuick1 can fail:

| make[2]: Entering directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source'
| rm -f libQt5WebKit.so.5.8.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.8
| linking ../lib/libQt5WebKit.so.5.8.0
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start'
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start'
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata'
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata'
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end'
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end'
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `__bss_start'
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_edata'
| /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_end'
| collect2: error: ld returned 1 exit status
| Makefile.api:92: recipe for target '../lib/libQt5WebKit.so.5.8.0' failed
| make[2]: *** [../lib/libQt5WebKit.so.5.8.0] Error 1
| make[2]: Leaving directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source'
| Makefile.QtWebKit:44: recipe for target 'sub-api-pri-make_first-ordered' failed
| make[1]: *** [sub-api-pri-make_first-ordered] Error 2

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-06-20 11:53:08 +02:00
Philip Balister
6605c48f3a python-pyqt5: Add recipe.
* Build tested on raspberrypi3
 * I promise to chase the patch upstream.
 * v2 auto detects QT_VERSION

Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-05-16 09:35:13 +02:00
Philip Balister
960aaf3658 qwt: Add recipe.
* Build tested for raspberrypi3.

Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-05-16 09:35:08 +02:00
Huang Qiyu
5f837b47f5 qttools: add ptest
Add ptest for qttools by using provided testsuite.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-04-12 16:05:30 +02:00
Gordan Markuš
e03d290bc0 qtwayland: fix initial window property values
This fixes a bug where there is nothing rendered on the
QtWayland surface due to missing window properties.

Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-04-12 16:05:25 +02:00
Gordan Markuš
5b0bb2babf qtdeclarative: fix memory leaks
* Fix QQmlExpression leaking QQmlError objects
* Fix V4 Javascript Engine creating duplicate entries
* Fix memory leak in QQuickWindowPrivate::deliverTouchAsMouse

Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-04-12 16:05:22 +02:00
Martin Jansa
817fc2a19b qtchooser: respect LDFLAGS
* fixes:
  qtchooser-39+git4717841185d34bbe450e3b24445f2d35e3325a6a: No GNU_HASH in the elf binary:
  '/tmp/work/armv5te-oe-linux-gnueabi/qtchooser/39+git4717841185d34bbe450e3b24445f2d35e3325a6a-r0/packages-split/qtchooser/usr/bin/qtchooser'
  [ldflags]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-04-10 13:44:53 +02:00
Gordan Markuš
1258138ec5 qtbase-native: create empty oe-device-extra.pri
Suppress multiple occurrences of the same warning while configuring
and compiling qtbase-native and nativesdk-qtbase.

WARNING: Unable to find file git/mkspecs/linux-oe-g++/../oe-device-extra.pri
Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-04-10 13:44:53 +02:00
Gordan Markuš
793f22fb02 qtwayland: update build without xkbcommon-evdev
Update patch that enables building qtwayland without xkbcommon-evdev.
Building qtwayland without xkbcommon-eved with the previous patch
resulted in the following error:

error: undefined reference to 'xkb_state_mod_name_is_active'
Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-04-10 13:44:53 +02:00
Denys Dmytriyenko
ff073f0410 nativesdk-qtbase: pass -no-icu for deterministic builds
Similar to qtbase-native. Otherwise it may fail with this error,
if icu is not yet staged:

| .../git/src/corelib/codecs/qicucodec.cpp:53:26: fatal error: unicode/ucnv.h: No such file or directory
|   #include "unicode/ucnv.h"
|                            ^
|  compilation terminated.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-16 17:47:24 +01:00
Andreas Müller
c4e34aaab9 qtwebengine: show progress for do_compile
This was stolen from meta-oe / meson.bbclass - qtwebengine uses ninja for
build too.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-16 17:47:24 +01:00
Niels Kolthoff
b72a117386 packagegroup-qt5-toolchain-target: add qtquickcontrols2 package
Signed-off-by: Niels Kolthoff <nkolthoff@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-16 17:47:24 +01:00
Gordan Markuš
77a7558a66 qtwebengine: add commercial license
Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-16 17:46:01 +01:00
Andreas Müller
abc89e9d7f qtbase-native; do not build qdbuscpp2xml and qdbusxml2cpp bootstrapped
This fixes build of kde's baloo. That project converts a header file using
QDBusMessage to xml which won't work. More details can be found at [1].
Problems with qdbus-helpers came up with update Qt5.7->Qt.5.8 where we use
bootstrapped qtbase-native for the first time due to qtbase's new configuration
and for reduced build time.

[1] http://lists.qt-project.org/pipermail/development/2017-February/028756.html

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-07 15:02:49 +01:00
Yann PERON
4f44a5799a packagegroup-qt5-toolchain-target: Add QtSerialBus to meta-toolchain-qt5.
Dynamic library Qt5SerialBus.so was not created in toolchain file system when I built bitbake meta-toolchain-qt5

Signed-off-by: Yann PERON <yann.peron@optimatic.fr>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-07 13:33:53 +01:00
Andreas Müller
9927aacfc3 qtbase: PACKAGECONFIG[gtk] change gtk+ -> gtk+3 in dependencies
| WARNING: QA Issue: qtbase-plugins rdepends on gtk+3, but it isn't a build dependency, missing gtk+3 in DEPENDS or PACKAGECONFIG? [build-deps]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-03-01 11:07:40 +01:00
Daniel Mack
595e9cf446 qtbase: remove absolute binary paths from mkspec files
When running 'bitbake -c populate_sdk' on an image that has qt5webkit
enabled, the uikit feature is enabled in qtbase, which then fails to install
with

  error: qtbase-mkspecs-5.8.0+git0+49dc9aa409-r0 conflicts with /usr/bin/perl

The culprit for this is /usr/lib/qt5/mkspecs/features/uikit/devices.pl,
which has #!/usr/bin/perl hardcoded. Fix this in a similar way other recipes
do it as well and strip out these bits at install time.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-26 12:25:50 +01:00
Schrempf Frieder
61c02506f6 qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDK
The patch 0008-configure-paths-for-target-qmake-properly.patch seems
to be intended for the target, not for native/nativesdk, as it breaks
the mkspec setting (sets linux-g++ instead of linux-oe-g++) by default.

This issue is also described here:
https://github.com/graugans/meta-udoo/issues/20#issuecomment-261241783

Signed-off-by: Frieder Schrempf <frieder.schrempf@exceet.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-26 12:25:34 +01:00
Max Krummenacher
ee301d84a7 populate_sdk_qt5: use _append operator
populate_sdk assigns TOOLCHAIN_HOST_TASK and TOOLCHAIN_TARGET_TASK with ?=.
Thus depending on the order in which populate_sdk and populate_sdk-qt5 get
parsed the assignments from populate_sdk are discarded and the resulting sdk
is missing among others the environment-setup script.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-13 14:01:13 +01:00
Andreas Müller
efa8aaf82e qmake5_base.bbclass: set qt.conf by environment variable again
Qt update to 5.8 caused fallout in meta-qt5-extra. It turned out that
qmake pulled in many pointers to native sysroot. Native sysroot is qmake's
default in case no configuration file qt.conf is set.
The problem with the new way of setting qt.conf by cmd parameter is that is has
to be set explicitly. For instance all the packages coming from [1] use
autotools for configuration. These ask qmake for paths during configuration
and build further Makefiles during compile. To patch these for additional cmd
parameter is nasty business.
Setting qt.conf when building all qtbase's causes errors during configuration.
To fix this we set the filename to a non existent file so that Qt's default is
used. This dirty hack was necessary because there was no way found to export
an empty variable OE_QMAKE_QTCONF_PATH.

This patch was tested by building huge parts of meta-qt5-extra. The meta-layers
did not yet contain oe-core's recipe-specific-sysroot changes so master build
might fail for missing dependencies.

[1] http://www.rncbc.org/drupal/

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-10 18:50:57 +01:00
Gordan Markuš
8ba28144d5 qtwebkit: depends on gperf-native
Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-07 12:55:53 +01:00
Martin Jansa
aa6551d149 qtwebengine: disable generate_character_data
* qtwebengine 5.8 fails to build it, because it mixes binaries for x86_64 host and x86 target when building for qemux86 on 64bit host
  https://bugreports.qt.io/browse/QTBUG-57705

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-03 14:51:15 +01:00
Martin Jansa
9ed82108c3 qtwayland: fix build without xkbcommon-evdev
* xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
* use patch from https://bugreports.qt.io/browse/QTBUG-57767

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-02 21:18:00 +01:00
Herve Jourdain
f37c5929a9 qtwayland: Add libxkbcommon in the dependencies
xkb should be optional, but it's not for the moment, so add it to the
dependencies.

Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-02 21:16:21 +01:00
Herve Jourdain
8092d985b8 qtbase: create empty oe-device-extra.pri
During configure, it complains it can't find oe-device-extra.pri,
but it doesn't result in any error. Fix it, though, just in case.

Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-02 21:16:21 +01:00
Anders Darander
00a9e0a887 cmake_qt5.bbclass: add qtbase-native to DEPENDS
When building with recipe-specific-sysroot's, qmake can't be found:

| CMake Error at WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:32 (message):
|   The imported target Qt5::Core references the file
|
|      WORKDIR/recipe-sysroot-native/usr/bin/qt5/qmake
|
|   but this file does not exist.  Possible reasons include:
|
|   * The file was deleted, renamed, or moved to another location.
|
|   * An install or uninstall procedure did not complete successfully.
|
|   * The installation package was faulty and contained
|
|      WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
|
|   but not all the files it references.
|
| Call Stack (most recent call first):
|   WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:6 (_qt5_Core_check_file_exists)
|   WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:163 (include)
|   WORKDIR/recipe-sysroot/usr/lib/cmake/Qt5/Qt5Config.cmake:31 (find_package)
|   CMakeLists.txt:56 (find_package)
|

This is solved by adding qtbase-native to the exported DEPENDS.

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-02 21:16:21 +01:00
Samuli Piippo
333949a823 Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
the contents of an environment value when qmake is run instead of when
Makefile is processed. All OE_QMAKE_xxx variables need to be exported
for qmake to find them. configure's setBootstrapVariable function needs
to change $$(..) to normal $(...) operator to work with qmake's Makefile.

qt.conf generation for qtbase recipes is not needed, as configure will
generate its own version based on configure arguments. Skip running
qmake, since configure is now automatically invoked when it's run in
qtbase's root folder.

Update PACKAGECONFIGs for qtbase to match current configure options.

The new Qt configuration system [1] can be used with a new variable
EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature
arguments.

Merge the two qtwayland recipes to one that supports all three targets
(target, native, nativesdk) without need for additional patch.

Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad.
Removes qtdeclarative-render2d

[1] https://www.mail-archive.com/development@qt-project.org/msg25257.html

Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-01-26 16:18:39 +01:00
Andreas Oberritter
c0ba8ab590 qtbase: Remove comments about ICU and QtWebKit
QtWebKit doesn't depend on icu in qtbase. It just didn't enable
it manually before.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-12-17 09:21:32 +01:00
Andreas Oberritter
4b5f80c1f6 qtwebkit: Always enable icu in QT_CONFIG
Allow qtwebkit to be built even if qtbase was configured without icu.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-12-17 09:18:59 +01:00
Janek Filus
4f74e02ff0 qtwebengine: use QT_GIT_PROTOCOL variable
Signed-off-by: Daniel Ottiger <daniel.ottiger@ch.schindler.com>
Signed-off-by: Janek Filus <janek.filus@bytesatwork.ch>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-12-17 09:16:54 +01:00
Vesa Jääskeläinen
81fb771c3f Update Qt5's git repositories to match new locations
Qt5's repositories in github has changed locations.

Qt5 itself and most of its modules are now under:
github.com/qt

Where as qt5-everywhere-demo is under:
github.com/qt-labs

Signed-off-by: Vesa Jääskeläinen <dachaac@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-11-01 19:07:51 +01:00
Andreas Oberritter
df324ebd49 qt5: Use existing variables for paths of host tools
Makes it possible to install qmake into ${bindir} without setting
QT_DIR_NAME = "".

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-11-01 19:07:47 +01:00
Vesa Jääskeläinen
6255c3bc0c qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled.
QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL,
QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and
QT_NO_SESSIONMANAGER, these has to be taken into account when compiling
QtWayland.

Signed-off-by: Vesa Jääskeläinen <dachaac@gmail.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-11-01 19:07:47 +01:00
Fabio Berton
047ebac230 qtwebengine: Add gperf-native to DEPENDS
Fix error:

FAILED: cd ../build/tmp/work/cortexa9hf-neon-mx6qdl-linux-gnueabi/qtwebengine/
5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/src/3rdparty/chromium/
third_party/WebKit/Source/platform; gperf "--key-positions=*" -D -s 2
ColorData.gperf "--output-file=../build/tmp/work/cortexa9hf-neon-mx6qdl-linux-
gnueabi/qtwebengine/5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/
src/core/Release/gen/blink/platform/ColorData.cpp"
 /bin/sh: gperf: command not found
 ninja: build stopped: subcommand failedP

Change-Id: Ic28d0ac72fcbce8054638a3168b5d6a34bc129b5
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-10-26 11:10:15 +02:00
Wenlin Kang
3a8679417f qtmultimedia: fix conflicting declaration error
The error info is as the follow:
| In file included from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopengl.h:123:0,
|                  from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglshaderprogram.h:41,
|                  from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/qsgmaterial.h:38,
|                  from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/QSGMaterial:1,
|                  from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.h:40,
|                  from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:37:
| /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglext.h:474:19: error: conflicting declaration 'typedef ptrdiff_t GLsizeiptr'
|  typedef ptrdiff_t GLsizeiptr;
|                    ^
| In file included from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:34:0:
| /.../sysroots/fsl-imx6/usr/include/GLES2/gl2.h:67:25: note: previous declaration as 'typedef khronos_ssize_t GLsizeiptr'
|  typedef khronos_ssize_t GLsizeiptr;
|                          ^
| In file included from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopengl.h:123:0,
|                  from /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglshaderprogram.h:41,
|                  from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/qsgmaterial.h:38,
|                  from /.../sysroots/fsl-imx6/usr/include/qt5/QtQuick/QSGMaterial:1,
|                  from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.h:40,
|                  from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:37:
| /.../sysroots/fsl-imx6/usr/include/qt5/QtGui/qopenglext.h:475:19: error: conflicting declaration 'typedef ptrdiff_t GLintptr'
|  typedef ptrdiff_t GLintptr;
|                    ^
| In file included from /.../qtmultimedia/5.5.1+gitAUTOINC+0cf41ef53f-r0/git/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp:34:0:
| /.../sysroots/fsl-imx6/usr/include/GLES2/gl2.h:68:26: note: previous declaration as 'typedef khronos_intptr_t GLintptr'
|  typedef khronos_intptr_t GLintptr;
|                           ^

Here, use lgl2.h instead of gl2.h and gl2ext.h,
fix the "conflicting declaration" error.

Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-10-26 11:10:03 +02:00
Joe Slater
7a58995591 layer.conf: add LAYERVERSION and LAYERDEPENDS
We just depend on "core".

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-10-26 11:09:53 +02:00
Jonathan Liu
9aa870eecf qtbase: avoid qmake errors due to missing oe-device-extra.pri
An empty oe-extra-extra.pri file is created if it does not exist to
suppress qmake errors.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-09-11 09:05:29 +02:00