Commit Graph

11 Commits

Author SHA1 Message Date
Martin Jansa
a6bee8ea4c Convert to new override syntax
This is the result of automated script (0.9.0) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-08-03 13:38:16 +02:00
Martin Jansa
b716195f60 qmake5_paths: change the default QT_DIR_NAME to be empty
* there aren't many people using qt4 and qt5 in the same
  image anymore, it's time to stop using this work around
  and to follow default packaging rules

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2018-09-25 09:22:18 +00:00
Samuli Piippo
7faa5d8f39 qt5: remove all references to qtquick1 import path
Since qtquick1 recipes have been removed, there is no need to have
OE_QMAKE_PATH_IMPORTS anymore.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2018-07-03 15:00:57 -03:00
Cody P Schafer
1fdc9a3f31 qttools: fix cmake usage of linguist tools
Without this, Qt5LinguistTools/Qt5LinguistToolsConfig.cmake would
attempt to locate lrelease and lupdate under prefix, even while we were
cross-compiling and prefix points at the native system's root dirs.

Signed-off-by: Cody P Schafer <dev@codyps.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-10-15 17:10:36 +02:00
Martin Jansa
394345ca29 qmake5_paths, qtbase: add OE_QMAKE_PATH_QT_FONTS
* people using fontconfig may want to change this path to
  ${datadir}/fonts, it was set to OE_QMAKE_PATH_LIBS in
  commit 1fdab229df
  to follow mkspecs/features/qpa/genericunixfontdatabase.prf
  fonts.path = $$[QT_INSTALL_LIBS]/fonts

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-09-29 17:41:59 +02:00
Adam YH Lee
6f0dd9f7cb Remove double slash when QT_DIR_NAME is empty
When `QT_DIR_NAME` is defined as an empty string (default is "qt5"),
package.bbclass will throw lots of QA warnings because now the paths contain
double slashes ("//").

We can address these warnings by explicitly defining a slash in the
variable itself.

Signed-off-by: Adam YH Lee <adam.yh.lee@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-09-21 11:56:52 +02:00
Jonathan Liu
bfddb2291e classes: qmake5: move QMAKE_MKSPEC_PATH variables to qmake5_paths
qmake5_paths.bbclass refers to QMAKE_MKSPEC_PATH_TARGET which is not
defined when inheriting qmake5_paths directly instead of qmake5_base.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-09-07 17:05:42 +02:00
Otavio Salvador
2bd5fba34d qmake5_paths.bbclass: Use Qt version path for headers
When looking for Qt5 headers we ought to use the Qt5 specific path. In
case the distribution wants to have a flat tree it can set QT_DIR_NAME
and it will still works as expected.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-24 09:21:21 -03:00
Simon Busch
b0100c1b57 classes: qmake5: move QT_DIR_NAME to qmake5_paths
* qmake5_paths.bbclass refers to QT_DIR_NAME but it's defined on a higher level which
  doesn't makes sense and breaks some use cases

Signed-off-by: Simon Busch <morphis@gravedo.de>
2013-07-25 20:12:14 +00:00
Martin Jansa
ca4a0758e1 qmake5_base: add override for HostLibraries
* qtdeclarative was using /usr/lib as HostLibraries causing
  WARNING: QA Issue: qtdeclarative: The compile log indicates that host include and/or library paths were used.
           Please check the log 'qtdeclarative/5.1.0-r0/temp/log.do_compile' for more information.
  DEBUG 1: /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/qt5/mkspecs/features/qt_config.prf:23: QT_MODULE_HOST_LIB_BASE := /usr/lib
* also without this fix qtdeclarative and qtwayland are trying to
  build tools against /usr/lib/libQt5Bootstrap.a (without sysroot
  prefix)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +02:00
Martin Jansa
4c197c6223 qmake5_base: Define OE_QMAKE_PATH_QT_* variables
* and move it to separate .bbclass which is easier to
  replace in distro layer when you don't care about
  conflicts with qt4

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 21:41:32 +02:00