summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2018-05-10 17:52:00 +0200
committerAnne Jan Brouwer <brouwer@annejan.com>2018-05-10 17:52:00 +0200
commit3f6f7533a6802a40b60fba8aad27f3781f033675 (patch)
treece3d021998294814b4ebba305d699dcc1c8839d9
parent9ec78e1511903315125d80c49040213a9141ea23 (diff)
Does appveyor do 5.10 yet (also CHANGELOG update)
-rw-r--r--.appveyor.yml2
-rw-r--r--CHANGELOG.md9
2 files changed, 10 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index ef09c1c0..00e02a53 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,5 @@
install:
- - set QTDIR=C:\Qt\5.9\mingw53_32
+ - set QTDIR=C:\Qt\5.10\mingw53_32
- choco install -y InnoSetup
- set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw530_32\bin;%PATH%;"C:\Program Files (x86)\Inno Setup 5"
build_script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 364863ca..a034fab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# Change Log
+## [Unreleased](https://github.com/IJHack/QtPass/tree/HEAD)
+
+[Full Changelog](https://github.com/IJHack/QtPass/compare/v1.2.2...HEAD)
+
+**Closed issues:**
+
+- Duplicate prefix in installation of tests directory in v1.2.2. [\#389](https://github.com/IJHack/QtPass/issues/389)
+- No icons on macOS [\#377](https://github.com/IJHack/QtPass/issues/377)
+
## [v1.2.2](https://github.com/IJHack/QtPass/tree/v1.2.2) (2018-05-07)
[Full Changelog](https://github.com/IJHack/QtPass/compare/v1.2.1...v1.2.2)