Build for multi qt4/qt5 ubuntu environment

RESOLVED FIXED in mozilla24

Status

RESOLVED FIXED
5 years ago
2 years ago

People

(Reporter: tatiana, Assigned: tatiana)

Tracking

Trunk
mozilla24
x86
Linux
Bug Flags:
in-testsuite -

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 2 obsolete attachments)

(Assignee)

Description

5 years ago
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
(Assignee)

Updated

5 years ago
Summary: Build with multi qt4/qt5 ubuntu environment → Build for multi qt4/qt5 ubuntu environment
(Assignee)

Comment 1

5 years ago
Created attachment 754019 [details] [diff] [review]
patch
Assignee: nobody → tanya.meshkova
Status: NEW → ASSIGNED
Attachment #754019 - Flags: review?(romaxa)
Attachment #754019 - Flags: review?(mh+mozilla)
Comment on attachment 754019 [details] [diff] [review]
patch

Looks good to me, thanks.
Attachment #754019 - Flags: review?(romaxa) → review+
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.
Attachment #754019 - Flags: review?(mh+mozilla) → review-
> >      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.
(Assignee)

Comment 5

5 years ago
Created attachment 761221 [details] [diff] [review]
patch v2
Attachment #754019 - Attachment is obsolete: true
Attachment #761221 - Flags: review?(mh+mozilla)
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.
Attachment #761221 - Flags: review?(mh+mozilla) → review+
(Assignee)

Comment 7

5 years ago
(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.
(Assignee)

Comment 8

5 years ago
Created attachment 765092 [details] [diff] [review]
patch v2.1 replaced the rest of echo's

Moving r+ from prev patch
Attachment #761221 - Attachment is obsolete: true
Attachment #765092 - Flags: review+
Attachment #765092 - Flags: checkin+
Keywords: checkin-needed
Attachment #765092 - Flags: checkin+ → checkin?
Attachment #765092 - Flags: checkin? → checkin+
https://hg.mozilla.org/mozilla-central/rev/b0d35883cc24
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla24

Updated

5 years ago
Depends on: 895238
Product: Core → Core Graveyard
You need to log in before you can comment on or make changes to this bug.