Skip to content

Commit

Permalink
[packaging] Allow build from QtCreator with Mer SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
monich committed Mar 27, 2015
1 parent f2aff7e commit 7a456ae
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -15,4 +15,4 @@ Makefile*
*.prl

libconnman-qt/connman_*_interface.*

connman-qt.pro.user
9 changes: 6 additions & 3 deletions rpm/connman-qt5.spec
Expand Up @@ -15,6 +15,10 @@ BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(dbus-1)

%{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
%{!?qtc_make:%define qtc_make make}


%description
This is a library for working with connman using Qt

Expand Down Expand Up @@ -44,9 +48,8 @@ applications using libconnman-qt
%setup -q -n %{name}-%{version}

%build
%qmake5 -r VERSION=%{version}

make %{?_smp_mflags}
%qtc_qmake5 -r VERSION=%{version}
%qtc_make %{?_smp_mflags}

%install
rm -rf %{buildroot}
Expand Down

0 comments on commit 7a456ae

Please sign in to comment.