update to latest

.github/ISSUE_TEMPLATE/---bug-report.md

@@ -0,0 +1,22 @@
+---
+name: "\U0001F41B Bug report"
+about: Report errors and problems.
+
+---
+
+**wkhtmltopdf version(s) affected**: x.y.z 
+
+**OS information**
+<!-- Your OS specification -->
+
+**Description**
+<!-- A clear and concise description of the problem. -->
+
+**How to reproduce**
+<!-- Html/css code and/or command line arguments needed to reproduce the problem. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Possible Solution**  
+<!--- Optional: only if you have suggestions on a fix/reason for the bug -->

.github/ISSUE_TEMPLATE/---documentation-issue.md

@@ -0,0 +1,8 @@
+---
+name: "\U0001F56E Documentation issue"
+about: Ideas/problems with a documentation.
+
+---
+
+**Description**  
+<!-- A clear and concise description of the problem/improvement. -->

.github/ISSUE_TEMPLATE/---feature-request.md

@@ -0,0 +1,11 @@
+---
+name: "\U0001F680 Feature request"
+about: Ideas for new features and improvements.
+
+---
+
+**Description**
+<!-- A clear and concise description of the new feature. -->
+
+**Example**  
+<!-- A simple example of the new feature in action. -->

.github/ISSUE_TEMPLATE/--packaging-issue.md

@@ -0,0 +1,10 @@
+---
+name: "⛔ Packaging issue"
+about: See https://github.com/wkhtmltopdf/packaging for packaging issues.
+
+---
+
+wkhtmltopdf has its own dedicated repository for packaging. Please open your
+packaging-related issue at https://github.com/wkhtmltopdf/packaging
+
+Thanks!

.github/ISSUE_TEMPLATE/--support-question.md

@@ -0,0 +1,12 @@
+---
+name: "⛔ Support Question"
+about: See https://wkhtmltopdf.org/support.html for questions.
+
+---
+
+We use GitHub issues only to discuss about wkhtmltopdf bugs and new features. For
+this kind of questions about using wkhtmltopdf, please use
+any of the support alternatives shown in https://wkhtmltopdf.org/support.html or 
+post an issue on https://stackoverflow.com/.
+
+Thanks!

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Report errors and problems.
+
+---
+
+**wkhtmltopdf version(s) affected**: x.y.z 
+
+**OS information**
+<!-- Your OS version -->
+
+**Description**
+<!-- A clear and concise description of the problem. -->
+
+**How to reproduce**
+<!-- Html/css code and/or command line arguments needed to reproduce the problem. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Possible Solution**  
+<!--- Optional: only if you have suggestions on a fix/reason for the bug -->

.github/workflows/official.yml

@@ -0,0 +1,75 @@
+name: Official
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  linux:
+    name: Qt 4.8 on Linux
+    runs-on: ubuntu-20.04
+    steps:
+      - name: checkout source
+        uses: actions/checkout@v2
+        with:
+          path: wkhtmltopdf
+          submodules: true
+      - name: checkout packaging
+        uses: actions/checkout@v2
+        with:
+          repository: wkhtmltopdf/packaging
+          path: packaging
+      - name: configure docker
+        run:  |
+          echo '{ "experimental": true }' | sudo tee /etc/docker/daemon.json
+          sudo systemctl restart docker
+      - name: build
+        run: cd packaging && python3 ./build package-docker buster-amd64 ../wkhtmltopdf
+
+  macos:
+    name: Qt 4.8 on macOS
+    runs-on: macos-10.15
+    steps:
+      - name: checkout source
+        uses: actions/checkout@v2
+        with:
+          path: wkhtmltopdf
+          submodules: true
+      - name: checkout packaging
+        uses: actions/checkout@v2
+        with:
+          repository: wkhtmltopdf/packaging
+          path: packaging
+      - name: setup build environment
+        run: |
+          brew install conan
+          pip3 install pyyaml
+          sudo gem install fpm --no-document
+          sudo xcode-select --switch /Library/Developer/CommandLineTools
+          sed -i -e 's/CFLAGS CXXFLAGS LDFLAGS/CFLAGS CXXFLAGS OBJECTIVE_CFLAGS LDFLAGS/g' wkhtmltopdf/qt/configure
+          sed -i -e 's/compiler.version=9.0/compiler.version=12.0/g' packaging/.conan/profiles/macos-cocoa
+      - name: build
+        run: cd packaging && MACOSX_DEPLOYMENT_TARGET=10.7 python3 ./build vagrant macos-cocoa --clean --version - - ../wkhtmltopdf
+
+  windows:
+    name: Qt 4.8 on Windows
+    runs-on: windows-2019
+    steps:
+      - name: checkout source
+        uses: actions/checkout@v2
+        with:
+          path: wkhtmltopdf
+          submodules: true
+      - name: checkout packaging
+        uses: actions/checkout@v2
+        with:
+          repository: wkhtmltopdf/packaging
+          path: packaging
+      - name: setup build environment
+        run: |
+          choco install -yr --no-progress vcbuildtools -ia "/Full"
+          pip install -q conan
+          cmd /c attrib "C:\Program Files (x86)\Windows Kits\10\include\wdf" +H
+      - name: build
+        run: cd packaging && python ./build vagrant msvc2015-win64 --clean --version - - ../wkhtmltopdf

.github/workflows/unpatched.yml

@@ -0,0 +1,27 @@
+name: Unpatched
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  qt4:
+    name: Qt 4.8 on Linux
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: install packages
+        run: sudo apt-get update && sudo apt-get install -y libqtwebkit-dev
+      - name: build
+        run: qmake-qt4 CONFIG+=silent && make
+
+  qt5:
+    name: Qt 5.12 on Linux
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: install packages
+        run: sudo apt-get update && sudo apt-get install -y libqt5webkit5-dev libqt5xmlpatterns5-dev libqt5svg5-dev
+      - name: build
+        run: qmake CONFIG+=silent && make

.gitignore

@@ -11,13 +11,14 @@ test/
 static-build/
 .obj/
 doc/
+docs/_site/
+docs/Gemfile.lock
 libdoc/
 man1/
 Makefile
 qrc_wkhtmltopdf.cpp
 Makefile.*
 *_resource.rc
-gitcontrol.bat
-gitcmd.lnk
-*.tar.bz2
-*.pyc
+*.o
+moc_*.*
+.qmake*

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "qt"]
-	path = qt
-	url = https://github.com/wkhtmltopdf/qt.git
+  path   = qt
+  url    = ../qt.git
+  branch = wk_4.8.7