Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[libmlocale] Fix to build with newer qt5 packaging.
  • Loading branch information
rburchell committed May 7, 2013
1 parent 1753d41 commit 7f13bf7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 0 additions & 6 deletions configure
Expand Up @@ -556,12 +556,6 @@ QT_MINOR_VERSION_NEEDED=7

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
Expand Down
2 changes: 2 additions & 0 deletions rpm/libmlocale-qt5.spec
Expand Up @@ -65,6 +65,7 @@ Requires: %{name} = %{version}-%{release}

%build
# >> build pre
export QT_SELECT=5
# << build pre

%configure --disable-static
Expand All @@ -76,6 +77,7 @@ make %{?jobs:-j%jobs}
%install
rm -rf %{buildroot}
# >> install pre
export QT_SELECT=5
# << install pre
%make_install

Expand Down

0 comments on commit 7f13bf7

Please sign in to comment.