aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* qt5: upgrade to 5.11.1Martin Jansa2018-06-2282-203/+120
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: add common PACKAGECONFIG for QtQuickCompilerSamuli Piippo2018-06-213-1/+5
| | | | | | | | | | | The previously commercial-only QtQuickCompiler is now merged into qtdeclarative. Add common PACKECONFIG which can be used to enable it, and by default enable it for Qt Charts and Qt VirtualKeyboard. https://doc-snapshots.qt.io/qt5-5.11/qtquick-deployment.html#compiling-qml-ahead-of-time Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: don't pass empty filename to functionSamuli Piippo2018-06-211-1/+1
| | | | | | | | The environment variable is empty when running qmake from SDK or in device, which gives 'Empty filename passed to function' warning. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* nativesdk-qtbase: add quotes to CC and CXX in environment fileSamuli Piippo2018-06-211-3/+3
| | | | | | | | CC and CXX include sysroot as argument to compiler and therefore includes spaces, which need to be quoted to work e.g., with dash. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Add packageconfigs for renameat2 and getentropy useKhem Raj2018-06-131-0/+4
| | | | | | | | | These features depend on underlying syscall support in kernel and if older kernels are in use, then we can have a knob to turn them off. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qttranslations: remove qtquick1 translation packageAndreas Müller2018-06-101-5/+7
| | | | | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-creator: Remove qtquick1 dependencyAndreas Müller2018-06-101-1/+1
| | | | | | | qtquick1 was removed Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: fix build with plugins as well as ozone enabledMartin Jansa2018-06-104-5/+56
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: add -fpermissiveMartin Jansa2018-06-061-0/+5
| | | | | | | | * http://errors.yoctoproject.org/Errors/Details/179245/ just use -fpermissive in this case like fedora did: https://bugzilla.redhat.com/show_bug.cgi?id=1582954 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: fix build with gcc8, part IIMartin Jansa2018-06-0617-30/+114
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: fix build with gcc8Martin Jansa2018-06-0514-25/+76
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtquick1: remove recipe and all referencesAndreas Müller2018-06-052-34/+0
| | | | | | | | * webkit part is broken (at least) * It is dead since 5.7 / 11/2016 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: do not skip build - use cmake as build systemAndreas Müller2018-06-052-28/+54
| | | | | | | | | | | | | | | | | | | | log.do_configure says: | The WebKit build was disabled for the following reasons: | * cross-compilation of QtWebKit with qmake is not supported yet | * Missing cmake from PATH | * Using cmake version , but at least cmake 2.8.12 is required to build QtWebKit. and build was finished without errors (but surprisingly fast). Looking into qtwebkit, it seems they have changed to cmake build system and Webkit.pro is just a wrapper for preparing and running cmake. For the transition the packageconfigs were translated as close as possible. 'libxcomposite' and 'libxrender' were merged to 'x11' - there is only one option 'ENABLE_X11_TARGET' available for both. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refresh the patches and update them on meta-qt5 repositoriesMartin Jansa2018-06-0541-107/+107
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: Update to Qt 5.11.0Samuli Piippo2018-05-3037-123/+84
| | | | | | Add recipes for Qt OPC UA and Qt WebGL platform plugin. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-creator: upgrade to 4.5.1Martin Jansa2018-04-206-131/+36
| | | | | | | | | | * old 3.5.1 isn't compatible with Qt 5.11 qt-creator-opensource-src-3.5.1/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp:891:23: error: invalid use of incomplete type 'class QStyle' | QIcon icon(style()->standardIcon(QStyle::SP_DockWidgetCloseButton)); | ^~ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* tufao: fix build with Qt 5.11, don't use qt5_use_modulesMartin Jansa2018-04-202-1/+94
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.11 beta3+Martin Jansa2018-04-2078-220/+141
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* packagegroup-qt5-toolchain-target: drop both qtwebkit packagesMartin Jansa2018-04-201-2/+0
| | | | | | * qtwebkit builds needs to be fixed first Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.11 AlphaMartin Jansa2018-04-2086-310/+161
| | | | | | | | | | | | | | | | | | | | | | | * use qtwebkit and qtwebkit-examples from dev branch, because there is no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in qt5-git.inc nobody noticed). * qtbase: drop qml-debug options removed from qtbase in: commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1 Author: Ulf Hermann <ulf.hermann@qt.io> Date: Fri Oct 6 16:27:09 2017 +0200 Subject: Remove qml-debug configure flag and feature * qtgraphicaleffects, qtquickcontrols2, qtquickcontrols, qtvirtualkeyboard: add qtdeclarative-native dependency needed for qmlcachegen binary * qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs referenced files disappered in: commit 6882a04fb36642862b11efe514251d32070c3d65 Author: Konstantin Tokarev <annulen@yandex.ru> Date: Thu Aug 25 19:20:41 2016 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: use mysql_config from correct pathSamuli Piippo2018-04-201-1/+1
| | | | | | | | | mysql_config from host sysroot is found first which gives wrong paths for cross-compilation. Use it from crosscompile path instead. Change-Id: Ia1e7d8e0c582016130f595b1be279255e9d0b055 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtmultimedia: Pass -DMESA_EGL_NO_X11_HEADERS=1 when x is disabledKhem Raj2018-04-181-0/+1
| | | | | | | | | | | | | | | | | | | Some graphics drives e.g. mali/mesa depend on this define to use proper guards in eglplatform.h Fixes | In file included from /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/egl.h:36:0, | from .moc/../../../../../../git/src/plugins/videonode/egl/qsgvideonode_egl.h:48, | from .moc/moc_qsgvideonode_egl.cpp:9: | /mnt/a/zonit/build/tmp/work/aarch64-bec-linux/qtmultimedia/5.10.1+gitAUTOINC+038716bb1f-r0/recipe-sysroot/usr/include/EGL/eglplatform.h:125:10: fatal error: X11/Xlib.h: No such file or directory | #include <X11/Xlib.h> | ^~~~~~~~~~~~ | compilation terminated. | make[4]: *** [Makefile:461: .obj/moc_qsgvideonode_egl.o] Error 1 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* cinematicexperience: Add liberation-fonts to RDEPENDSFabio Berton2018-04-181-1/+1
| | | | | | | Install liberation-fonts package to show cinematicexperience fonts. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtlocation: Add licenses used under mapboxgl.Timo Jyrinki2018-04-181-1/+2
| | | | | | | | These licenses are in use in the fetched mapboxgl submodule but not currently listed in the recipe: Apache-2.0, MIT, openssl and BSL-1.0. Signed-off-by: Timo Jyrinki <timo.jyrinki@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Update to latest on 5.9 branchKhem Raj2018-04-181-1/+1
| | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Fix build on armv7ve (rpi)Khem Raj2018-04-181-0/+8
| | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix umask for do_generate_qt_environment_fileDennis Menschel2018-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom task "do_generate_qt_environment_file" generates the directory "environment-setup.d" with permission 775 instead of 755. When other recipes populate the same directory with different permissions, a package manager like RPM will report this as an error. The solution is to either set the installation permissions explicitly with "install -d [-m 755]", or specify the umask for the custom task. This commit uses the latter approach and fixes errors like the following when trying to generate an SDK: $ bitbake <image-with-qt5> -c populate_sdk [...] Error: Transaction check error: file /opt/poky/2.4.2/sysroots/x86_64-pokysdk-linux/environment-setup.d conflicts between attempted installs of nativesdk-cmake-3.8.2-r0.x86_64_nativesdk and nativesdk-qtbase-tools-5.9.4+git0+0d9208cecb-r0.x86_64_nativesdk A detailed discussion about this problem can also be found here [1]. [1] https://stackoverflow.com/a/49003464 Signed-off-by: Dennis Menschel <menschel-d@posteo.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides ↵Hongxu Jia2018-04-182-6/+0
| | | | | | | | | | | | | | | | | | | | | | qttranslations-qtconfig It failed to build meta-toolchain-qt5: ... Error: Problem: conflicting requests - nothing provides qttranslations-qtconfig needed by packagegroup-qt5-toolchain-target-1.0-r0.noarch ... The upstream removed qtconfig translations: ... commit a6b3446cb023e7b3a5f8aa12ea0d650d2b804334 Author: Alexander Volkov <a.volkov@rusbitech.ru> Date: Thu Sep 14 19:33:25 2017 +0300 Remove qtconfig translations ... Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
* Change default SRC_URI from github.com to code.qt.ioMikko Gronoff2018-04-181-1/+2
| | | | | | | | | | | | | There have been issues in the past with github qt mirror being out of sync with code.qt.io for certain module repos. Right now there's been a several days long break in update cycle for seemingly all the qt modules where content has not been pushed to the github mirror. Change the default SRC_URI to the more reliable code.qt.io. Change-Id: Ic7d3b9a82ef0ae502e99a8516ef78ca09250fd1e Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-git.inc: drop nobranch=1Martin Jansa2018-04-065-3/+11
| | | | | | | | | | | | | | * sneaked in with: commit 333949a8239dfa7788b35f1059614733e11a6a25 Author: Samuli Piippo <samuli.piippo@qt.io> Date: Thu Jan 26 16:54:50 2017 +0200 Upgrade to Qt 5.8 * use 5.10.1 branch by defaut and fix QT_MODULE_BRANCH in qtknx, qtmqtt, qtwebkit-examples, qtwebkit which don't have 5.10.1 branch at all Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* maliit-framework-qt5: refresh patchesMartin Jansa2018-04-062-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING: maliit-framework-qt5-0.99.0+gitAUTOINC+62bd54bcde-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch 0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch patching file config.pri Hunk #1 succeeded at 144 with fuzz 1 (offset -17 lines). Now at patch 0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtpurchasing: upgrade to 5.10.1Martin Jansa2018-02-261-1/+1
| | | | | | * like the rest of qt* recipes Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: Add recipe for qtpurchasing.Timo Jyrinki2018-02-261-0/+13
| | | | | | | | | | | | Qt Purchasing was introduced as a new module in Qt 5.7. It was previously only available with Qt's commercial license. It can be used to build payment features. The commit hash in the recipe is the latest in the 5.10 branch. Licenses were combed with licensecheck tool. Signed-off-by: Timo Jyrinki <timo.jyrinki@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refresh patches from meta-qt5/qt* reposMartin Jansa2018-02-2655-102/+75
| | | | | | | | | | | * apply: 0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch also for nativesdk-qtbase as the comment says * drop unused: 0001-Add-missing-include-for-struct-timeval.patch which wasn't removed in 5.10.1 upgrade Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Replace -isystem with -IKhem Raj2018-02-263-0/+38
| | | | | | | Fixes no-x11 builds (eglfs) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add a config option to optimize for sizeKwangsub Kim2018-02-261-1/+4
| | | | | | | | | | | | The '-optimize-size' option would enable the compiler to optimize for size instead of speed. If the global compiler option already included '-Os', this option would be enabled by default. It would affect the whole Qt libraries and Qt applications as well. This feature is available in Qt 5.9+. Signed-off-by: Kwangsub Kim <kwangsub.kim@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* packagegroup-qt5-toolchain-target: Add qtcharts and qtmqtttexierp2018-02-221-0/+5
| | | | | Signed-off-by: Pierre-Jean TEXIER <texier.pj2@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upgrade to Qt 5.10.1Mikko Gronoff2018-02-2239-97/+70
| | | | | | | | | Updated Qt modules to 5.10.1. New recipe qtknx added. Change-Id: I711c75253a9c0d9dcfbaac8867b35a4505d101ea Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: refactor ptestSamuli Piippo2018-02-227-89/+9
| | | | | | | | | | | Current implementation was causing build issues as it cluttered source directories and modified recipe sysroot content. Tests are now build in the separate build directory ${B} where we don't need to worry about moving files to the recipe sysroot, and if tests are enabled in PACKAGECONFIG, they have been already built during do_compile task. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix pcre PACKAGECONFIGStefan Müller-Klieser2018-01-161-1/+1
| | | | | | | | | | Qt switched to pcre2 for 5.9. The configure switch has not been renamed. We just need to update the build dependency. This requires the poky commit: 0204af2 libpcre2: add packages for 16-bit and 32-bit code unit support Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt: refresh remaining patches and tags in meta-qt5 reposMartin Jansa2018-01-1666-215/+214
| | | | | | | | | * update tag name to match the patches in meta-qt5 repository where the meta-qt5 .patch files are maintained, so that it's more clear from where these changes are exported (with: git format-patch --no-numbered --no-signature) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: explicitly depend on bison-nativeDenys Dmytriyenko2018-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | QtWebEngine uses bison during the build. While normally bison-native gets staged into sysroot indirectly by the toolchain via binutils-cross, it's better to have the dependency listed explicitly for deterministic builds. Otherwise, when using an external toolchain, it fails like this: | FAILED: gen/blink/core/XPathGrammar.cpp gen/blink/core/XPathGrammar.h | .../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/bin/python-native/python2 | ../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/rule_bison.py | ../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/XPathGrammar.y gen/blink/core bison | Traceback (most recent call last): | File "../../../../git/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/rule_bison.py", line 83, in <module> | returnCode = subprocess.call([bisonExe, '-d', '-p', prefix, inputFile, '-o', outputCpp]) | File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 168, in call | return Popen(*popenargs, **kwargs).wait() | File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 390, in __init__ | errread, errwrite) | File ".../qtwebengine/5.9.3+...-r0/recipe-sysroot-native/usr/lib/python2.7/subprocess.py", line 1024, in _execute_child | raise child_exception | OSError: [Errno 2] No such file or directory Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtmqtt: add recipetexierp2018-01-151-0/+12
| | | | | | | Qt MQTT module was added in Qt 5.10. (http://doc.qt.io/QtMQTT/index.html) Signed-off-by: Pierre-Jean TEXIER <texier.pj2@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix a regressionMing Liu2018-01-155-14/+15
| | | | | | | | | | | | | | | | A flaw was introduced by commit b8a236df: [ qt5: Fix cmake config files ] Removing ${S}/include must be done before configure script being called, but it's not in that case for qtbase-native recipe after the commit, that is saying, ${S}/include was removed after configure being called, which causes compiling issues for native build. Further more, the logic introduced by commit b8a236df should only apply to qtbase recipes, so they should be moved to qtbase recipes as well. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: introduce QT_EDITIONMing Liu2018-01-153-3/+3
| | | | | | | | QT_EDITION defaults to 'opensource', but the end users could override it with 'commercial' if they want. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* packagegroup-qt5-qtcreator-debug: remove qtdeclarative-pluginsMax Krummenacher2017-12-271-1/+1
| | | | | | | | | | | | | This package is no longer created, it was also removed when moving to qt 5.8 with commit 333949a8239dfa7788b35f1059614733e11a6a25 from packagegroup-qt5-toolchain-target.bb. As the packagegroup was added for a target providing cross-debugging services for qtcreator (commit 53242713da6ae01f2b1f7e674b00517390fe2bcb) and maybe the package parent qtdeclarative is still needed, add that one instead. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase_git: install qt.conf for the targetJeroen Hofstee2017-12-201-0/+2
| | | | | | | | | | | | | The build-in qmake settings point to the sysroots on the host machine. Running qmake on the target hence errors with: Could not find qmake configuration file linux-oe-g++. Error processing project file So add qt.conf to the target image with the correct locations. Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: mkspecs: add default toolchain optionsJeroen Hofstee2017-12-201-0/+22
| | | | | | | | | | | | | | | | | | | | | While most mkspecs use hardcoded compiler names / options, qmake in meta-qt5 is setup to get them from the environment. While this works fine with openembedded, it does break normal workflows outside of it. For example to get the SDK working with Qt Creator either the environmental script most be sourced first, making it impossible to switch between different Qt versions or the OE_QMAKE must be set for every project, otherwise you get cryptic errors like 'make: c: Command not found', since the compiler name is not set and hence an attempt is made to execute only the arguments. Likewise on the target itself, qmake doesn't work without first setting the OE_QMAKE variables. This patch adds default toolchains options, so it is no longer required to set them, but keeps the flexibility to alter them from the environment. Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: remove use of OE_QMAKE_WAYLAND_SCANNERSamuli Piippo2017-12-201-5/+4
| | | | | | | | | | This was never defined for nativesdk, which then broke sdk which had nativesdk-qtwayland included. Rather than add it there, remove its use everywhere, since it was not adding anything meaningful to the build. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtlocation: correct PACKAGECONFIG for mapboxglSamuli Piippo2017-12-201-2/+1
| | | | | | | | Previous patch was removed, but PACKAGECONFIG was not changed to match the new feature flag. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>