[oe] [PATCH] change qmake2 to qmake4 for consistency

[Valentin Longchamp]

Ihar Hrachyshka wrote:
> On Thu, Jun 18, 2009 at 8:03 PM, Valentin
> Longchamp<valentin.longchamp at epfl.ch> wrote:
>> Signed-off-by: Valentin Longchamp <valentin.longchamp at epfl.ch>
>> ---
>>  classes/qmake2.bbclass           |   21 ---------------------
>>  classes/qmake4.bbclass           |   21 +++++++++++++++++++++
>>  recipes/qt4/qt4-tools-native.inc |    3 +--
>>  3 files changed, 22 insertions(+), 23 deletions(-)
>>  delete mode 100644 classes/qmake2.bbclass
>>  create mode 100644 classes/qmake4.bbclass
>>
>> diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
>> deleted file mode 100644
>> index 26e813a..0000000
>> --- a/classes/qmake2.bbclass
>> +++ /dev/null
>> @@ -1,21 +0,0 @@
>> -#
>> -# QMake variables for Qt4
>> -#
>> -inherit qmake_base
>> -
>> -DEPENDS_prepend = "qt4-tools-native "
>> -
>> -export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
>> -export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
>> -export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
>> -export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
>> -export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
>> -export OE_QMAKE_QDBUSCPP2XML = "${STAGING_BINDIR_NATIVE}/qdbuscpp2xml4"
>> -export OE_QMAKE_QDBUSXML2CPP = "${STAGING_BINDIR_NATIVE}/qdbusxml2cpp4"
>> -export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
>> -export OE_QMAKE_LINK = "${CXX}"
>> -export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
>> -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
>> -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
>> -export OE_QMAKE_LIBS_QT = "qt"
>> -export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
>> diff --git a/classes/qmake4.bbclass b/classes/qmake4.bbclass
>> new file mode 100644
>> index 0000000..c5ce100
>> --- /dev/null
>> +++ b/classes/qmake4.bbclass
>> @@ -0,0 +1,21 @@
>> +#
>> +# QMake variables for Qt4
>> +#
>> +inherit qmake_base
>> +
>> +DEPENDS_prepend = "qt4-tools-native "
>> +
>> +export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
>> +export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
>> +export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
>> +export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
>> +export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
>> +export OE_QMAKE_QDBUSCPP2XML = "${STAGING_BINDIR_NATIVE}/qdbuscpp2xml4"
>> +export OE_QMAKE_QDBUSXML2CPP = "${STAGING_BINDIR_NATIVE}/qdbusxml2cpp4"
>> +export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake4"
>> +export OE_QMAKE_LINK = "${CXX}"
>> +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
>> +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
>> +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
>> +export OE_QMAKE_LIBS_QT = "qt"
>> +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
>> diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc
>> index 0fd4f92..5d1a781 100644
>> --- a/recipes/qt4/qt4-tools-native.inc
>> +++ b/recipes/qt4/qt4-tools-native.inc
>> @@ -60,8 +60,7 @@ do_compile() {
>>
>>  do_stage() {
>>     install -d ${STAGING_BINDIR_NATIVE}/
>> -    install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
>> -    for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
>> +    for i in qmake moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
>>         install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
>>     done
> 
> 1) qmake name should be changed for qt4-tools-sdk too.
> 2) no inherit qmake2 -> inherit qmake4 changes done.
> 
> If this is fixed I'll vote for the change.
> 

Sure, I did not send the whole patch since it only is a RFC (see the 
other mail I have just sent before). All these changes are ready to be sent.

I'll send it tomorrow morning.

Val

-- 
Valentin Longchamp, PhD Student, EPFL-STI-LSRO1
valentin.longchamp at epfl.ch, Phone: +41216937827
http://people.epfl.ch/valentin.longchamp
MEA3485, Station 9, CH-1015 Lausanne