mingderwang
/ gist:94205de855af7c60cafa88564ea6abd7
Created
March 5, 2017 08:08
hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| $ git pull origin master //run this first, then | |
| $ git push origin master |
sergeyfarin
/ pyqt5_qwebengineview.py
Last active
March 6, 2024 07:24
Example of using Python, PyQt5 and QtWebEngineView to open local html file (+js, css). test.html and test.js should be in html subfolder
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # coding: utf-8 | |
| import sys | |
| import os | |
| # import site | |
| # site.addsitedir('/usr/local/lib/python2.7/site-packages') | |
| from PyQt5 import QtCore, QtWidgets, QtWebEngineWidgets | |
| app = QtWidgets.QApplication(sys.argv) | |
| view = QtWebEngineWidgets.QWebEngineView() |