diff options
author | Anne Jan Brouwer <brouwer@annejan.com> | 2017-11-01 21:06:44 +0100 |
---|---|---|
committer | Anne Jan Brouwer <brouwer@annejan.com> | 2017-11-01 21:06:44 +0100 |
commit | 8b9191a586290c5063d05cd0d7777a651e6ce184 (patch) | |
tree | f694b3e1b0f0b48c51f914c74605aeb064b9688d | |
parent | 5814ad3768a3771a55fb786159d64084e357a7dd (diff) | |
parent | 2ae3b2db564d859fe8560e2b4b63bad42f3533b7 (diff) |
Merged master inrelease
-rw-r--r-- | .appveyor.yml | 6 | ||||
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | qtpass.iss | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index f262442f..ef09c1c0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,18 +1,18 @@ install: - - set QTDIR=C:\Qt\5.8\mingw53_32 + - set QTDIR=C:\Qt\5.9\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: - qmake qtpass.pro CONFIG+=static - mingw32-make - - mingw32-make check +# - mingw32-make check #after_build: - cmd: copy README.md src\release\README.txt - cmd: copy LICENSE src\release\LICENSE.txt - iscc qtpass.iss artifacts: - path: Output\qtpass-*.exe - - path: src\release\qtpass.exe + - path: main\release\qtpass.exe deploy: provider: GitHub auth_token: diff --git a/.travis.yml b/.travis.yml index 9b39a548..3c116d61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: global: secure: WaZq3f6KIAc0dnR4WOXYWDvUYiqlrzsZC/PQse47FnvC0oQC65J5w3kJOj/P26DgsUEqKQF3ukXogkM2mp5pS4+CMgivEmQmAbgQTtwcKpC5HPZxgI+8FgkCjcalJKWGWYoxlScNVNiKMs+89ApcSQE9kH9PZeUS9dukN2Php1U= before_install: -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt592-trusty; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi addons: coverity_scan: @@ -30,7 +30,7 @@ install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install pandoc; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt58base qt58tools qt58svg; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt59base qt59tools qt59svg; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo apt-get -qq install g++-6 gcc-6; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6; fi - if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-6 90; fi @@ -38,7 +38,7 @@ install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then gem install coveralls-lcov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install lcov; fi before_script: -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt58/bin/qt58-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt59/bin/qt59-env.sh; fi - qmake -v script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then qmake CONFIG+=coverage -Wall qtpass.pro; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e08c871..5349a267 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Do not hide passwords and no generator [\#267](https://github.com/IJHack/QtPass/issues/267) - Weird behavior when turning on git support \(auto push/pull\) with non-clean git dir [\#128](https://github.com/IJHack/QtPass/issues/128) +- SingleApplication implementation buggy [\#26](https://github.com/IJHack/QtPass/issues/26) **Closed issues:** @@ -26,12 +27,15 @@ - QtPass hangs when trying to decrypt entry [\#313](https://github.com/IJHack/QtPass/issues/313) - Unable to locate package \(Linux Mint 17.3\) [\#310](https://github.com/IJHack/QtPass/issues/310) - Git commit signing [\#303](https://github.com/IJHack/QtPass/issues/303) +- Add to Linux brew [\#301](https://github.com/IJHack/QtPass/issues/301) - Pass 1.7 testing [\#299](https://github.com/IJHack/QtPass/issues/299) - Measure unit-test code coverage [\#298](https://github.com/IJHack/QtPass/issues/298) - Config dialog: Propose "Password behaviour" label change [\#294](https://github.com/IJHack/QtPass/issues/294) - make install currently broken. [\#289](https://github.com/IJHack/QtPass/issues/289) +- Unable to locate package \(Raspbian\) [\#287](https://github.com/IJHack/QtPass/issues/287) - There is no `git cp` [\#272](https://github.com/IJHack/QtPass/issues/272) - pass is apparently switching out pwgen [\#264](https://github.com/IJHack/QtPass/issues/264) +- Bugs since refactoring [\#262](https://github.com/IJHack/QtPass/issues/262) - pass working fine but qtprocess failure with qtpass [\#260](https://github.com/IJHack/QtPass/issues/260) - Feature: CTRL/CMD + Q closes the mainwindow [\#258](https://github.com/IJHack/QtPass/issues/258) - Refactoring: removal of lastDecrypt [\#256](https://github.com/IJHack/QtPass/issues/256) @@ -73,7 +73,7 @@ Source: "{#QtDir}\bin\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "{#QtDir}\plugins\platforms\qwindows.dll"; DestDir: "{app}\platforms\"; Flags: ignoreversion
Source: "{#QtDir}\plugins\iconengines\qsvgicon.dll"; DestDir: "{app}\iconengines\"; Flags: ignoreversion
-Source: "src\release\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "main\release\qtpass.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "src\release\README.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "src\release\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
|