qt5-webengine:fixed conflict

2016-06-14 22:28:14 +03:00
parent cd42ab6295
commit 59eb9ad614
1 changed files with 0 additions and 5 deletions
@@ -14,12 +14,7 @@ def setup():
    shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
    shelltools.export("QT5DIR", "/usr/lib/qt5")
    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")
-=======
-    qt5.configure(parameters="WEBENGINE_CONFIG+=use_proprietary_codecs")
-    #shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
->>>>>>> e48ac11fa2d0a58e97e44fadb628cef95f99f432
    
 def build():
    qt5.make()