On Wed, Feb 19, 2014 at 12:22:36AM -0300, Otavio Salvador wrote: > When looking for Qt5 components and files 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.
NAK I don't think this is good idea, end-user applications shouldn't install their data, archdata, examples etc in qt5 subdirectories. https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE#wiki-bad-include-paths-and-build-failing-to-find-qt5-headers If you don't care about qt4/qt5 separation just set empty QT_DIR_NAME and all qtmodules will fold into default directories and you won't need OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" listed in above wiki. > Signed-off-by: Otavio Salvador <[email protected]> > --- > I have built two image and the SDK from scratch using this with no > issues. Could someone also give this a try? > > classes/qmake5_base.bbclass | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass > index 3861cd0..ec0267a 100644 > --- a/classes/qmake5_base.bbclass > +++ b/classes/qmake5_base.bbclass > @@ -57,20 +57,20 @@ do_generate_qt_config_file() { > cat > ${QT_CONF_PATH} <<EOF > [Paths] > Prefix = ${OE_QMAKE_PATH_PREFIX} > -Headers = ${OE_QMAKE_PATH_HEADERS} > +Headers = ${OE_QMAKE_PATH_QT_HEADERS} > Libraries = ${OE_QMAKE_PATH_LIBS} > -ArchData = ${OE_QMAKE_PATH_ARCHDATA} > -Data = ${OE_QMAKE_PATH_DATA} > +ArchData = ${OE_QMAKE_PATH_QT_ARCHDATA} > +Data = ${OE_QMAKE_PATH_QT_DATA} > Binaries = ${OE_QMAKE_PATH_BINS} > LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS} > Plugins = ${OE_QMAKE_PATH_PLUGINS} > Imports = ${OE_QMAKE_PATH_IMPORTS} > Qml2Imports = ${OE_QMAKE_PATH_QML} > -Translations = ${OE_QMAKE_PATH_TRANSLATIONS} > -Documentation = ${OE_QMAKE_PATH_DOCS} > -Settings = ${OE_QMAKE_PATH_SETTINGS} > -Examples = ${OE_QMAKE_PATH_EXAMPLES} > -Tests = ${OE_QMAKE_PATH_TESTS} > +Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS} > +Documentation = ${OE_QMAKE_PATH_QT_DOCS} > +Settings = ${OE_QMAKE_PATH_QT_SETTINGS} > +Examples = ${OE_QMAKE_PATH_QT_EXAMPLES} > +Tests = ${OE_QMAKE_PATH_QT_TESTS} > HostBinaries = ${OE_QMAKE_PATH_HOST_BINS} > HostData = ${OE_QMAKE_PATH_HOST_DATA} > HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS} > -- > 1.7.10.4 > > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
