Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5-webengine:fixed conflict

Browse Source
This commit is contained in:
ayhanyalcinsoy
2016-06-14 22:28:14 +03:00
parent cd42ab6295
commit 59eb9ad614
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webengine/actions.py
-5
View File
@@ -14,12 +14,7 @@ def setup():
shelltools.export("QT5LINK", "/usr/lib/qt5/bin") shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
shelltools.export("QT5DIR", "/usr/lib/qt5") shelltools.export("QT5DIR", "/usr/lib/qt5")
shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.11.0.0" % get.CFLAGS()) shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.11.0.0" % get.CFLAGS())
<<<<<<< HEAD
shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro") shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
=======
qt5.configure(parameters="WEBENGINE_CONFIG+=use_proprietary_codecs")
#shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
>>>>>>> e48ac11fa2d0a58e97e44fadb628cef95f99f432
def build(): def build():
qt5.make() qt5.make()