rpms/qt5-qtquickcontrols
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Merge fix

Browse Source
This commit is contained in:
Helio Chissini de Castro 2015-12-10 22:16:51 +01:00
commit ef7a1f5cc1
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/qtquickcontrols-opensource-src-5.5.1-rc1.tar.xz /qtquickcontrols-opensource-src-5.5.1-rc1.tar.xz
/qtquickcontrols-opensource-src-5.5.1.tar.xz /qtquickcontrols-opensource-src-5.5.1.tar.xz
/qtquickcontrols-opensource-src-5.6.0-beta.tar.gz /qtquickcontrols-opensource-src-5.6.0-beta.tar.gz
/qtquickcontrols-opensource-src-5.6.0-beta1.tar.xz

4
qt5-qtquickcontrols.spec
View File

@ -8,7 +8,7 @@
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Summary: Qt5 - module with set of QtQuick controls Summary: Qt5 - module with set of QtQuick controls
Version: 5.6.0 Version: 5.6.0
Release: 0.2%{?dist} Release: 0.3%{?dist}
License: LGPLv2 or LGPLv3 and GFDL License: LGPLv2 or LGPLv3 and GFDL
Url: http://www.qt.io Url: http://www.qt.io
@ -101,7 +101,7 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
%changelog %changelog
* Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.2 * Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.3
- Official beta release - Official beta release
* Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1 * Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1

4
sources
View File

@ -1 +1,5 @@
<<<<<<< HEAD
bd9779b99bc8031166b2972ee2f80b83 qtquickcontrols-opensource-src-5.6.0-beta.tar.gz bd9779b99bc8031166b2972ee2f80b83 qtquickcontrols-opensource-src-5.6.0-beta.tar.gz
=======
d3df94b69827f940f0f80f993db4b87c qtquickcontrols-opensource-src-5.6.0-beta1.tar.xz
>>>>>>> 268002b0616dfc5f3c6c3acbbd6229bef41e6766