[oe] [meta-qt5][PATCH v2 1/4] qmake5_base.bbclass: Use Qt version path for headers

[Otavio Salvador]

On Sun, Feb 23, 2014 at 12:02 PM, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Sun, Feb 23, 2014 at 10:50:11AM -0300, Otavio Salvador wrote:
>> 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>
>> ---
>>  classes/qmake5_base.bbclass |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
>> index 3861cd0..db6834f 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_HEADERS}/${QT_DIR_NAME}
>
> classes/qmake5_paths.bbclass:OE_QMAKE_PATH_HEADERS = "${includedir}"
>
> is the right place

Sorry for missing this, indeed. Fixed in v4.


-- 
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