876043 - Build for multi qt4/qt5 ubuntu environment

Status: RESOLVED FIXED

(Core Graveyard :: Widget: Qt, defect)

Description

[Tatiana Meshkova (:tatiana)]

1) Fix configuration for building with multi qt4/qt5 ubuntu environment
2) Minor compile issue after landing bug 842927 (Qt::Key_Print) + qt5, not valid identifier.
3) QInputContext is removed in Qt5

Comment 1

[Tatiana Meshkova (:tatiana)]

Attachment: patch

Comment 2

[Oleg Romashin (:romaxa)]

Comment on attachment 754019 [details] [diff] [review]
patch

Looks good to me, thanks.

Comment 3

[Mike Hommey [:glandium]]

Comment on attachment 754019 [details] [diff] [review]
patch

Review of attachment 754019 [details] [diff] [review]:
-----------------------------------------------------------------

::: configure.in
@@ +4705,5 @@
>      [  --with-qtdir=\$dir       Specify Qt directory ],
>      [ QTDIR=$withval])
>  
>      if test -z "$QTDIR"; then
> +        AC_CHECK_PROGS(HOST_QMAKE, $QMAKE qmake, "")

Does HOST_ mean this is expected to be run as native on cross compiles?

@@ +4709,5 @@
> +        AC_CHECK_PROGS(HOST_QMAKE, $QMAKE qmake, "")
> +        QT_VERSION=`$HOST_QMAKE -v | grep 'Using Qt version' | grep -oP '\d+\.\d+\.\d+'`
> +        case $QT_VERSION in
> +        5.*)
> +            echo "Using qt5: $QT_VERSION"

While here, please make this use AC_MSG_RESULT.

@@ +4710,5 @@
> +        QT_VERSION=`$HOST_QMAKE -v | grep 'Using Qt version' | grep -oP '\d+\.\d+\.\d+'`
> +        case $QT_VERSION in
> +        5.*)
> +            echo "Using qt5: $QT_VERSION"
> +            PKG_CHECK_MODULES(MOZ_QT, Qt5Gui Qt5Network Qt5Core Qt5OpenGL Qt5Widgets Qt5Multimedia Qt5PrintSupport)

You're not checking if this succeeds.

@@ +4727,5 @@
>          AC_CHECK_PROGS(HOST_MOC, $MOC moc, "")
>          AC_CHECK_PROGS(HOST_RCC, $RCC rcc, "")
>      else
> +        HOST_QMAKE="$QTDIR/bin/qmake"
> +        QT_VERSION=`$HOST_QMAKE -v | grep 'Using Qt version' | grep -oP '\d+\.\d+\.\d+'`

Please factor this out and share with the other branch.

Comment 4

[Oleg Romashin (:romaxa)]

> >      if test -z "$QTDIR"; then
> > +        AC_CHECK_PROGS(HOST_QMAKE, $QMAKE qmake, "")
> 
> Does HOST_ mean this is expected to be run as native on cross compiles?

qmake is just Makefile creator which can generate makefiles for cross and native compilation... it does not produce any binaries... and here it only used as provider of default Qt version used by system.

Comment 5

[Tatiana Meshkova (:tatiana)]

Attachment: patch v2

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 761221 [details] [diff] [review]
patch v2

Review of attachment 761221 [details] [diff] [review]:
-----------------------------------------------------------------

::: configure.in
@@ +4744,5 @@
> +        case $QT_VERSION in
> +        5.*)
> +            AC_MSG_RESULT("Using qt5: $QT_VERSION")
> +            PKG_CHECK_MODULES(MOZ_QT, Qt5Gui Qt5Network Qt5Core Qt5OpenGL Qt5Widgets Qt5PrintSupport, ,
> +              [echo "$MOZ_QT_PKG_ERRORS"

PKG_CHECK_MODULES should be outputting error messages already.

Comment 7

[Tatiana Meshkova (:tatiana)]

(In reply to Mike Hommey (high latency until June 25) [:glandium] from comment #6)

> > +            PKG_CHECK_MODULES(MOZ_QT, Qt5Gui Qt5Network Qt5Core Qt5OpenGL Qt5Widgets Qt5PrintSupport, ,
> > +              [echo "$MOZ_QT_PKG_ERRORS"
> 
> PKG_CHECK_MODULES should be outputting error messages already.

It does only if there is no custom action-if-failed argument. I need packages info to be there too.

Comment 8

[Tatiana Meshkova (:tatiana)]

Attachment: patch v2.1 replaced the rest of echo's

Moving r+ from prev patch

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b0d35883cc24

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/b0d35883cc24