Skip to content

Commit

Permalink
[libmlocale] Fix configure for Qt 5 builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
rburchell committed Apr 19, 2013
1 parent c02654f commit 1753d41
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions configure
Expand Up @@ -554,13 +554,18 @@ fi
QT_MAJOR_VERSION_NEEDED=4
QT_MINOR_VERSION_NEEDED=7

QT_VERSION=`$QMAKE_BIN -version | tail -1`
QT_VERSION=$($QMAKE_BIN -query QT_VERSION)

if [ $? -ne 0 ]; then
# qtchooser + qt5?
QMAKE_BIN="qmake -qt=5"
QT_VERSION=$($QMAKE_BIN -query QT_VERSION)
fi

QT_MAJOR_VERSION=0
QT_MINOR_VERSION=0
QT_PATCH_VERSION=0
if [ -n "$QT_VERSION" ]; then
QT_VERSION=`echo $QT_VERSION | sed 's,^ *Using *Qt *version *\([^ ]*\) *in .*$,\1,'`
MAJOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'`
if [ -n "$MAJOR" ]; then
MINOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'`
Expand Down

0 comments on commit 1753d41

Please sign in to comment.