Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Ertuğrul Erata
2016-06-29 15:00:39 +03:00
3 changed files with 5 additions and 8 deletions
+3 -6
View File
@@ -47,7 +47,9 @@ def setup():
if not get.buildTYPE() == "emul32":
#-no-pch makes build ccache-friendly
options = "-v -confirm-license -opensource -no-rpath -no-use-gold-linker\
options = "-v -confirm-license -opensource \
-no-rpath \
-no-use-gold-linker\
-prefix %s \
-bindir %s \
-headerdir %s \
@@ -70,9 +72,6 @@ def setup():
-optimized-qmake \
-reduce-relocations \
-dbus-linked \
-feature-menu \
-feature-textdate \
-feature-ftp \
-xcursor" % (qt5.prefix, bindirQt5, qt5.headerdir, qt5.archdatadir, qt5.docdir, qt5.plugindir, qt5.importdir, qt5.qmldir, qt5.datadir, qt5.testdir, qt5.translationdir, qt5.sysconfdir, qt5.examplesdir, qt5.libdir)
else:
pisitools.dosed("mkspecs/linux-g++-64/qmake.conf", "-m64", "-m32")
@@ -119,6 +118,4 @@ def install():
mkspecPath = "%s/mkspecs" % qt5.archdatadir
pisitools.remove("/usr/lib/*.prl")
pisitools.dodoc("LGPL_EXCEPTION.txt", "LICENSE.*")
+1 -1
View File
@@ -255,7 +255,7 @@
<History>
<Update release="4">
<Date>2016-06-09</Date>
<Date>2016-06-29</Date>
<Version>5.6.0</Version>
<Comment>Release Bump</Comment>
<Name>Pisi Linux Community</Name>
+1 -1
View File
@@ -154,7 +154,7 @@
<History>
<Update release="2">
<Date>2016-06-16</Date>
<Date>2016-06-29</Date>
<Version>51.0.2704.84</Version>
<Comment>Version Bump.</Comment>
<Name>Ergün Salman</Name>