Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb46477' into 'mer-5.6'
[qtdeclarative] Package qmlimportscanner with devel-tools. JB#46477

See merge request mer-core/qtdeclarative!26
  • Loading branch information
pvuorela committed Jul 9, 2019
2 parents 25268e4 + 46e90bf commit 9129188
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions rpm/qtdeclarative.spec
Expand Up @@ -239,18 +239,12 @@ Requires: %{name} = %{version}-%{release}
%description tool-qml
This package contains the %{summary} tool

%package tool-qmlimportscanner
Summary: QML runtime binary
Group: Qt/Qt
Requires: %{name} = %{version}-%{release}

%description tool-qmlimportscanner
This package contains the %{summary} tool

%package devel-tools
Summary: QML development tools
Group: Qt/Qt
Requires: %{name} = %{version}-%{release}
Provides: %{name}-tool-qmlimportscanner
Conflicts: %{name}-tool-qmlimportscanner < 5.6.3+git10

%description devel-tools
This package contains QML debugging and development tools
Expand Down Expand Up @@ -421,12 +415,9 @@ mkdir -p %{buildroot}/%{_docdir}/qt5/qtquick
%defattr(-,root,root,-)
%{_qt5_bindir}/qml

%files tool-qmlimportscanner
%defattr(-,root,root,-)
%{_qt5_bindir}/qmlimportscanner

%files devel-tools
%defattr(-,root,root,-)
%{_qt5_bindir}/qmlimportscanner
%{_qt5_bindir}/qmlplugindump
%{_qt5_bindir}/qmlprofiler
%{_qt5_bindir}/qmltestrunner
Expand Down

0 comments on commit 9129188

Please sign in to comment.