[oe] [meta-qt5][PATCH] qmake5_base.bbclass: Use Qt version specific paths

[Otavio Salvador]

Hello,

On Thu, Feb 20, 2014 at 9:22 AM, Otavio Salvador
<otavio at ossystems.com.br> wrote:
> On Thu, Feb 20, 2014 at 9:18 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
>> 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.
>
> and what about we change just the headers? I want to avoid every
> recipe using Qt5 and qmake to require setting the headers var.

Like this:

commit 0f8dc68b8bc8f129fbba4ee3692884f2324e9d28
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Feb 18 14:03:49 2014 -0300

    qmake5_base.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 at ossystems.com.br>

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 3861cd0..0cfb5a4 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -57,7 +57,7 @@ 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}


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750