[RFC] change qmake2 to qmake4

[RFC] change qmake2 to qmake4

[Valentin Longchamp]

As I have already explained in an email earlier today, some tools
(cmake for instance, with its FindQt4 Module) look for a qmake under
a certain name (that can be qmake or qmake4 ... but not qmake2).

This patch proposes to change this name. With this, all the other qt
tools consistently have the 4 at the end of their name.

Of course, all the recipes that inherit qmake2 should be changed, but
this is not done here since it's only a RFC to start a discussion

Best Regards

Valentin

[PATCH] change qmake2 to qmake4 for consistency

[Valentin Longchamp]

Signed-off-by: Valentin Longchamp <valentin.longchamp@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.6.0.4

Re: [PATCH] change qmake2 to qmake4 for consistency

[Ihar Hrachyshka]

On Thu, Jun 18, 2009 at 8:03 PM, Valentin
Longchamp<valentin.longchamp@epfl.ch> wrote:
>
> Signed-off-by: Valentin Longchamp <valentin.longchamp@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.

>
> --
> 1.6.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [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@epfl.ch> wrote:
>> Signed-off-by: Valentin Longchamp <valentin.longchamp@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@epfl.ch, Phone: +41216937827
http://people.epfl.ch/valentin.longchamp
MEA3485, Station 9, CH-1015 Lausanne

Re: [RFC] change qmake2 to qmake4

[Henning Heinold]

Hi,

as said on irc you have my full ack, to get this a little bit saner.

Bye Henning

[PATCH] changed all needed recipes

[Valentin Longchamp]

Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
---
 classes/qt4e.bbclass               |    2 +-
 classes/qt4x11.bbclass             |    2 +-
 recipes/mythtv/mythtv_0.18.1.bb    |    2 +-
 recipes/mythtv/mythtv_0.20.bb      |    2 +-
 recipes/mythtv/mythtv_svn.bb       |    2 +-
 recipes/qt4/qt4-tools-sdk_4.5.1.bb |    3 +--
 recipes/qt4/qt4.inc                |    6 +++---
 recipes/webkit/webkit.inc          |    6 +++---
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass
index f72e06b..54fdb1d 100644
--- a/classes/qt4e.bbclass
+++ b/classes/qt4e.bbclass
@@ -1,5 +1,5 @@
 DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-embedded')]}"
-inherit qmake2
+inherit qmake4
 
 QT_DIR_NAME = "qtopia"
 QT_LIBINFIX = "E"
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 923717f..99069b2 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,6 +1,6 @@
 DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}"
 
-inherit qmake2
+inherit qmake4
 
 # Qt4 uses atomic instructions not supported in thumb mode
 ARM_INSTRUCTION_SET = "arm"
diff --git a/recipes/mythtv/mythtv_0.18.1.bb b/recipes/mythtv/mythtv_0.18.1.bb
index 2d3f55c..7dfa60f 100644
--- a/recipes/mythtv/mythtv_0.18.1.bb
+++ b/recipes/mythtv/mythtv_0.18.1.bb
@@ -1,6 +1,6 @@
 require mythtv.inc
 
-inherit qmake2 qt3x11
+inherit qmake4 qt3x11
 
 PR = "r2"
 
diff --git a/recipes/mythtv/mythtv_0.20.bb b/recipes/mythtv/mythtv_0.20.bb
index 467ed51..758b9b5 100644
--- a/recipes/mythtv/mythtv_0.20.bb
+++ b/recipes/mythtv/mythtv_0.20.bb
@@ -1,6 +1,6 @@
 require mythtv.inc
 
-inherit qmake2 qt3x11
+inherit qmake4 qt3x11
 
 DEPENDS += "openchrome"
 PR = "r1"
diff --git a/recipes/mythtv/mythtv_svn.bb b/recipes/mythtv/mythtv_svn.bb
index 83ce825..b90293d 100644
--- a/recipes/mythtv/mythtv_svn.bb
+++ b/recipes/mythtv/mythtv_svn.bb
@@ -1,6 +1,6 @@
 require mythtv.inc
 
-inherit qmake2 qt4x11
+inherit qmake4 qt4x11
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/qt4/qt4-tools-sdk_4.5.1.bb b/recipes/qt4/qt4-tools-sdk_4.5.1.bb
index db919fd..7c7e077 100644
--- a/recipes/qt4/qt4-tools-sdk_4.5.1.bb
+++ b/recipes/qt4/qt4-tools-sdk_4.5.1.bb
@@ -63,8 +63,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
 }
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index f5da652..a7209e6 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -14,7 +14,7 @@ QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \
 
 EXTRA_OEMAKE = "-e"
 
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake4 -after \
              INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
              QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
              AR="${TARGET_PREFIX}ar cqs" \
@@ -105,7 +105,7 @@ FILES_${QT_BASE_NAME}-mkspecs              = "${datadir}/${QT_DIR_NAME}/mkspecs/
 do_configure() {
     unset QMAKESPEC
     unset QTDIR
-    ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
+    ln -sf ${STAGING_BINDIR_NATIVE}/qmake4 bin/qmake
     ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
     cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/
 
@@ -280,7 +280,7 @@ do_stage() {
 
     # FIXME: install symlinks to tools?
     #install -d ${STAGING_DATADIR}/${QT_DIR_NAME}/bin
-    #ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 ${STAGING_DATADIR}/${QT_DIR_NAME}/bin/qmake
+    #ln -sf ${STAGING_BINDIR_NATIVE}/qmake4 ${STAGING_DATADIR}/${QT_DIR_NAME}/bin/qmake
     #for qttool in moc uic uic3 rcc lrelease lupdate; do
     #     ln -sf ${STAGING_BINDIR_NATIVE}/${qttool}4 ${STAGING_DATADIR}/${QT_DIR_NAME}/bin/${qttool}
     #done
diff --git a/recipes/webkit/webkit.inc b/recipes/webkit/webkit.inc
index 087115d..0fd0c4e 100644
--- a/recipes/webkit/webkit.inc
+++ b/recipes/webkit/webkit.inc
@@ -7,7 +7,7 @@ PACKAGES =+ "${PN}launcher-dbg ${PN}launcher"
 # Yes, this is wrong...
 PV = "0.1+svnr${SRCREV}"
 
-inherit qmake2 pkgconfig
+inherit qmake4 pkgconfig
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -23,10 +23,10 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/"
 
-WEBKIT_QMAKE = "qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ ${WEBKIT_EXTRA_OPTIONS} CONFIG+=${WEBKIT_PORT}"
+WEBKIT_QMAKE = "qmake4 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ ${WEBKIT_EXTRA_OPTIONS} CONFIG+=${WEBKIT_PORT}"
 
 do_configure() {
-	qmake2 -spec ${QMAKESPEC} CONFIG+=${WEBKIT_PORT} ${WEBKIT_EXTRA_OPTIONS} CONFIG-=release CONFIG+=debug
+	qmake4 -spec ${QMAKESPEC} CONFIG+=${WEBKIT_PORT} ${WEBKIT_EXTRA_OPTIONS} CONFIG-=release CONFIG+=debug
 	mkdir -p WebKitBuilds/Debug
 	cd WebKitBuilds/Debug
 	PWD=`pwd` ${WEBKIT_QMAKE}  WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} $PWD/../../WebKit.pro
-- 
1.6.0.4

Re: [RFC] change qmake2 to qmake4

[Holger Hans Peter Freyther]

On Thursday 18 June 2009 19:03:33 Valentin Longchamp wrote:
> As I have already explained in an email earlier today, some tools
> (cmake for instance, with its FindQt4 Module) look for a qmake under
> a certain name (that can be qmake or qmake4 ... but not qmake2).

Kind of nack. 

#qmake-qt4 -v
QMake version 2.01a

z.

Re: [RFC] change qmake2 to qmake4

[Holger Hans Peter Freyther]

On Thursday 18 June 2009 19:03:33 Valentin Longchamp wrote:
> As I have already explained in an email earlier today, some tools
> (cmake for instance, with its FindQt4 Module) look for a qmake under
> a certain name (that can be qmake or qmake4 ... but not qmake2).
>
> This patch proposes to change this name. With this, all the other qt
> tools consistently have the 4 at the end of their name.
>
> Of course, all the recipes that inherit qmake2 should be changed, but
> this is not done here since it's only a RFC to start a discussion

nack for now. qmake4 is worse than calling it qmake2. The current major qmake 
version is "2". We can talk about calling it "qmake" or "qmake-qt4".

z.

Re: [RFC] change qmake2 to qmake4

[Valentin Longchamp]

Holger Hans Peter Freyther wrote:
> On Thursday 18 June 2009 19:03:33 Valentin Longchamp wrote:
>> As I have already explained in an email earlier today, some tools
>> (cmake for instance, with its FindQt4 Module) look for a qmake under
>> a certain name (that can be qmake or qmake4 ... but not qmake2).
>>
>> This patch proposes to change this name. With this, all the other qt
>> tools consistently have the 4 at the end of their name.
>>
>> Of course, all the recipes that inherit qmake2 should be changed, but
>> this is not done here since it's only a RFC to start a discussion
> 
> nack for now. qmake4 is worse than calling it qmake2. The current major qmake 
> version is "2". We can talk about calling it "qmake" or "qmake-qt4".
> 

Ok, fine for me. The other way could be to patch cmake to make it look 
for qmake2 instead of qmake.

With this, qmake would be found by the FindQt.cmake module. However, the 
problem would not be solved yet (there is another thing that comes in 
the way, please see my other email to the list, coming in a few minutes).

Val

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