summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
Commit message (Collapse)AuthorAgeFilesLines
* qt5: update submodulesv5.7.15.7Mikko Gronoff2016-12-271-1/+1
| | | | | | | | Qt 5.7.1 content Change-Id: I16ac21529d88628b82c2b1299845653336b38d97 Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2016-11-161-1/+1
| | | | | | Change-Id: Iec217181d48ef840afedadf7725efdf30474e46c Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2016-11-081-1/+1
| | | | | Change-Id: I871cd10788828e53158b9b54c657fad0ea09b543 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge branch 'upstream/morty' into 5.7Mikko Gronoff2016-10-211-0/+2
|\ | | | | | | | | | | | | * upstream/morty: qtbase: avoid qmake errors due to missing oe-device-extra.pri Change-Id: I8ea051eb8f2d1354c41a1fab903879685548cbea
| * qtbase: avoid qmake errors due to missing oe-device-extra.priJonathan Liu2016-09-111-0/+3
| | | | | | | | | | | | | | | | 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>
* | qt5: update submodulesMikko Gronoff2016-10-201-2/+1
| | | | | | | | | | | | | | | | Updated modules, license files and removed 2 obsolete patches in qtbase and qtdeclarative Change-Id: Ic0bdc9497a5c6663881190688a0e5693c20bfeb7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Merge remote-tracking branch 'meta-qt5/master' into 5.7Samuli Piippo2016-09-121-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qt5-opengles2-test: Add recipe libqofono: import from meta-luneos layer libconnman-qt5: move to recipes-connectivity and don't use MeeGo as prefix qtdeclarative: add upstream patch to fix QtQml crash with GCC 6 qtvirtualkeyboard: add PACKAGECONFIG options qtbase: avoid QA warning if PACKAGECONFIG_RELEASE = "debug" qtbase: Fix build with QT_NO_OPENGL Change-Id: I5b1efc0de3fdf0d4fe98135c0cc08ddb3d03293b
| * qtbase: avoid QA warning if PACKAGECONFIG_RELEASE = "debug"Jonathan Liu2016-08-311-0/+1
| | | | | | | | | | | | | | | | If PACKAGECONFIG_RELEASE = "debug", an invalid PACKAGECONFIG QA warning is shown. To avoid this, we add dummy debug PACKAGECONFIG. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: Fix build with QT_NO_OPENGLJohannes Pointner2016-08-311-0/+1
| | | | | | | | | | | | | | This fixes the build of qtbase without opengl support Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge remote-tracking branch 'meta-qt5/master' into 5.7Samuli Piippo2016-08-231-10/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qtbase: fix drm dependency for eglfs PACKAGECONFIG qt5: upgrade to latest revisions in 5.7 branch qt5-opengles2-test: remove cmake_qt5.bbclass: when using _prepend don't forget to add space at the end qtquick1: fix qtwebkit support qtbase: add PACKAGECONFIG for journald logging qtserialbus: add recipe qtwayland: Rework recipe to allow PACKAGECONFIG use qtwayland: add dependency on libxcomposite qtcharts: Add dependency on qtmultimedia packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS. Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: Ia3d047984b6249526d6bf14373114d0fc734c458
| * qtbase: fix drm dependency for eglfs PACKAGECONFIGMartin Jansa2016-08-081-1/+1
| | | | | | | | | | | | * there isn't virtual/drm, just drm Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to latest revisions in 5.7 branchMartin Jansa2016-08-051-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. * recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch was resolved in upstream commit: commit 26229cfa0b729313893af5674d604e8692dbb946 Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Date: Tue Apr 26 15:08:34 2016 +0200 QDeclarativeTextInput: update API to use setBlinkingCursorEnabled Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: add PACKAGECONFIG for journald loggingChristoph Settgast2016-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Note from qtbase configure script: If your users intend on developing applications if logging to journal is enabled, ensure that the IDEs they use either set QT_LOGGING_TO_CONSOLE to 1 or the IDE is able to read the logged output from journald. Signed-off-by: Christoph Settgast <christoph.settgast@methodpark.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qtbase: fix cmake pathsSamuli Piippo2016-06-061-2/+1
| | | | | | | | | | | | | | | | | | Bring back patch for cmake to use OE_QMAKE_PATH_EXTERNAL_HOST_BIN to determine path to host binaries. Resolves QA Issue: Qt5Core.pc failed sanity test (tmpdir) in path. Change-Id: I55d4f390f24c6e223f3b1a0bded57337233c23c0 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Merge remote-tracking branch 'meta-qt5/master' into 5.7Samuli Piippo2016-06-031-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qtchooser: add new recipe qtvirtualkeyboard: add recipe qtdeclarative-render2d: add recipe qtdatavis3d: add recipe qtcharts: add recipe licenses: update technology preview license to match upstream cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE qtbase: add patch to make Qt5Config modules behave better with cmake builds qt5: Allow disabling SHA validation for branch qtbase: Reorder EGL libraries from pkgconfig and defaults: Change-Id: If0804ddb8c506e6f0d1ec32251cca6620dd97abe
| * qtbase: add patch to make Qt5Config modules behave better with cmake buildsPascal Bach2016-05-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a project if using the cmake bbclass and the CMakeLists.txt file uses find_package to find Qt5 and error like this is produced: | The imported target "Qt5::Core" references the file | | "/qmake" | | but this file does not exist. Possible reasons include: This is because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only set in the cmake_qt5 bblcass. To make it work better in that case the Qt5Config files check if OE_QMAKE_PATH_EXTERNAL_HOST_BINS is defined and bail out if not. For CMake this is the same as Qt5 wasn't found. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: Reorder EGL libraries from pkgconfig and defaults:Julien Gueytat2016-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugreports.qt.io/browse/QTBUG-50838 https://bugreports.qt.io/browse/QTBUG-52739 The modification is the less intrusive possible. It only swaps LIBS and QMAKE_LIBS_EGL. The reason behind that was that for the RaspberryPi: * -lEGL -GLESv2 can link * -lGLESv2 -lEGL can't Adding -lEGL -lGLESv2 and then -lEGL gives -lGLESv2 -lEGL ... the libraries swaped. Signed-off-by: Julien Gueytat <contact@jgueytat.fr> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: update submodulesSamuli Piippo2016-05-191-1/+1
| | | | | | | | | | | | | | | | Change PV to 5.7.0 Change-Id: I525ba69fe3e0f881eee52f7ab56071d555dd8b89 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'meta-qt5/master' into 5.7Samuli Piippo2016-05-091-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfig qtbase: remove fonts packages qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyle qt5: upgrade to latest revisions in 5.7 branches qt5: add one more subfolder for ${PN}-qmldesigner replace base_contains by bb.utils.contains qt5: upgrade to latest revision in 5.6 branch qt5: set SRCREVs,PVs to 5.6.0 qtquickcontrols: fix compilation of examples/texteditor qtdeclarative: fix compilation of examples/qquickviewcomparison quazip: update to 0.7.2 qtquickcontrols2: initial add 5.6.0 qmake5_base: use remove-libtool bbclass recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF qtwebengine: enable ARMv7VE support Add .gitignore to ignore .pyc/.pyo files Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch recipes-qt/qt5/qtbase/0009-Always-build-uic.patch recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: Ifab26e8f8a0c8cb8af94509f657161de09c182d7
| * qtbase: remove fonts packagesMartin Jansa2016-05-021-40/+0
| | | | | | | | | | | | | | | | | | | | | | * fonts were removed from qtbase in: commit c5ceabb9a1caf6b9b7615a28c3097f221772f645 Author: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Date: Mon Aug 17 18:32:41 2015 +0200 Purge all fonts Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyleMartin Jansa2016-05-021-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * xvideo and xinerama were removed in: commit e824abd987d77efaa085fe1f9fb514d270798d55 Author: Alexander Volkov <a.volkov@rusbitech.ru> Date: Tue Oct 13 18:43:25 2015 +0300 configure: Remove unused options -xvideo and -xinerama -xvideo was not used even by Qt 4 for a long time. -xinerama was used by the xlib plugin which was dropped by e6a7a6a381c0b61a93a642b425ecbcd714fd1c29. * xinput was removed in: commit fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f Author: Alexander Volkov <a.volkov@rusbitech.ru> Date: Thu Oct 8 18:19:39 2015 +0300 configure: Remove -xinput option It's obsolete since e6a7a6a381c0b61a93a642b425ecbcd714fd1c29 (Remove xlib plugin) and a2337f79ffd229aa1e91f6bfec6294570eb3fe44 (Remove Windows and X11 from src/widgets/platforms). The actual option is -xinput2. * gtkstyle was removed (partially replaced with gtk) in: commit 899a815414e95da8d9429a4a4f4d7094e49cfc55 Author: Dmitry Shachnev <mitya57@gmail.com> Date: Thu Jul 30 21:32:43 2015 +0300 Remove gtk2 style from qtbase, it will be moved to qtstyleplugins This will allow us to drop gtk2 support from qtbase in future, while still providing the gtk2 style for those who want to use it. Also with moving to qtstyleplugins, the code can be simplified because we can directly link to libraries we need, instead of using QLibrary. [ChangeLog][QtWidgets] Remove QGtkStyle, it is now provided in qtstyleplugins repository. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to latest revisions in 5.7 branchesMartin Jansa2016-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * these revisions are after v5.7.0-beta1 tags where available * it's highly recommended to read: http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ to find out how you're affected check which files/tools are included in your builds, e.g. for qtwebengine: OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c 11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$ 67 ** $QT_BEGIN_LICENSE:BSD$ 17 ** $QT_BEGIN_LICENSE:FDL$ 61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$ 261 ** $QT_BEGIN_LICENSE:LGPL$ * change in chromium's LICENSE is only copyright year update Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * replace base_contains by bb.utils.containsAndreas Müller2016-05-021-5/+5
| | | | | | | | | | 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-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONFMartin Jansa2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | qt5: update submodulesSamuli Piippo2016-04-131-1/+1
| | | | | | | | | | Change-Id: I0d5b877609f761c8bcca90c118cceb15d61a3dcc Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | qt5: Add mingw supportSamuli Piippo2016-04-131-21/+10
| | | | | | | | | | Change-Id: Ibd6449396be71761e10c84bdb9a9b1888affc618 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | qt5: upgrade to latest revisions in 5.7 branchesMartin Jansa2016-03-021-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qtbase: remove fonts packagesMartin Jansa2016-03-021-40/+0
| | | | | | | | | | | | | | | | | | | | | | * fonts were removed from qtbase in: commit c5ceabb9a1caf6b9b7615a28c3097f221772f645 Author: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Date: Mon Aug 17 18:32:41 2015 +0200 Purge all fonts Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyleMartin Jansa2016-03-021-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * xvideo and xinerama were removed in: commit e824abd987d77efaa085fe1f9fb514d270798d55 Author: Alexander Volkov <a.volkov@rusbitech.ru> Date: Tue Oct 13 18:43:25 2015 +0300 configure: Remove unused options -xvideo and -xinerama -xvideo was not used even by Qt 4 for a long time. -xinerama was used by the xlib plugin which was dropped by e6a7a6a381c0b61a93a642b425ecbcd714fd1c29. * xinput was removed in: commit fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f Author: Alexander Volkov <a.volkov@rusbitech.ru> Date: Thu Oct 8 18:19:39 2015 +0300 configure: Remove -xinput option It's obsolete since e6a7a6a381c0b61a93a642b425ecbcd714fd1c29 (Remove xlib plugin) and a2337f79ffd229aa1e91f6bfec6294570eb3fe44 (Remove Windows and X11 from src/widgets/platforms). The actual option is -xinput2. * gtkstyle was removed (partially replaced with gtk) in: commit 899a815414e95da8d9429a4a4f4d7094e49cfc55 Author: Dmitry Shachnev <mitya57@gmail.com> Date: Thu Jul 30 21:32:43 2015 +0300 Remove gtk2 style from qtbase, it will be moved to qtstyleplugins This will allow us to drop gtk2 support from qtbase in future, while still providing the gtk2 style for those who want to use it. Also with moving to qtstyleplugins, the code can be simplified because we can directly link to libraries we need, instead of using QLibrary. [ChangeLog][QtWidgets] Remove QGtkStyle, it is now provided in qtstyleplugins repository. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: upgrade to latest revisions in 5.7 branchesMartin Jansa2016-03-021-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Change dependency from virtual/mesa to drm in the kms packageconfig.Teemu Holappa2016-03-021-1/+1
| | | | | | | | | | | | In some configurations there no provider for virtual/mesa, but only drm libaries. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | recipes: use new EXTRA_CONF_PACKAGECONFIG instead of EXTRA_OECONFMartin Jansa2016-03-021-1/+1
|/ | | | | | | | | | | * 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 will probably be merged in Yocto 2.1, if you want to use latest meta-qt5 with older oe-core you need to append EXTRA_OECONF to EXTRA_CONF_PACKAGECONFIG 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>
* qtbase: upgrade SRCREVs a bit moreMartin Jansa2016-02-201-1/+1
| | | | | | * to make sure that qtbase modules report 4.6.1 version 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>
* qt5: upgrade to latest revisions in 5.6 branch (5.6 RC)Martin Jansa2016-02-201-3/+3
| | | | 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>
* align target qmake paths/mkspecAndreas Müller2015-12-151-0/+1
| | | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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>
* qt5: upgrade to latest revision in 5.6 branch (5.6.0-alpha1+)Martin Jansa2015-11-111-28/+8
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add glib to PACKAGECONFIG_X11Andreas Müller2015-11-111-1/+1
| | | | | | | | | | | | | | | | configure script disables gtkstyle if glib is not set. See configure section: | # auto-detect GTK style support | if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then | ... | elif [ "$CFG_GLIB" = "no" ]; then | CFG_QGTKSTYLE=no | fi for more details. Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix QA warning of host uid leakageAnders Darander2015-10-271-1/+1
| | | | | | | | By using cp, the wrong uid ended up in the package. Use install, as that will automatically handle the uid and gid. Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.5 branch (5.5.1+)upstream/jansa/jethrojansa/jethroMartin Jansa2015-10-231-1/+1
| | | | | | | * this is probably last upgrade for jethro branch, master will switch to 5.6 soon Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5_paths, qtbase: add OE_QMAKE_PATH_QT_FONTSMartin Jansa2015-09-291-12/+12
| | | | | | | | | | * people using fontconfig may want to change this path to ${datadir}/fonts, it was set to OE_QMAKE_PATH_LIBS in commit 1fdab229df6000eb52ac721a3ff4cdd218a0c308 to follow mkspecs/features/qpa/genericunixfontdatabase.prf fonts.path = $$[QT_INSTALL_LIBS]/fonts Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.5 branchesMartin Jansa2015-09-251-6/+6
| | | | | | * qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>