Merge branch 'IJHack/master'

.appveyor.yml

@@ -1,16 +1,17 @@
 install:
-  - set QTDIR=C:\Qt\5.5\mingw492_32
+  - set QTDIR=C:\Qt\5.7\mingw53_32
   - choco install -y InnoSetup
   - set PATH=%QTDIR%\bin;C:\MinGW\bin;%PATH%;"C:\Program Files (x86)\Inno Setup 5"
 build_script:
- - qmake qtpass.pro CONFIG+=static
- - mingw32-make
-after_build:
- - cmd: copy README.md release\README.txt
- - cmd: copy LICENSE release\LICENSE.txt
- - iscc qtpass.iss
+  - qmake qtpass.pro CONFIG+=static
+  - mingw32-make
+#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
 deploy:
   provider: GitHub
   auth_token:

.coafile

@@ -0,0 +1,12 @@
+[Default]
+bears = SpaceConsistencyBear
+files = *.cpp, *.h, *.ui
+use_spaces = true
+default_actions = SpaceConsistencyBear: ApplyPatchAction
+
+[DOCS]
+bears = SpaceConsistencyBear
+files = *.md
+
+[commit]
+bears = GitCommitBear

.gitignore

@@ -3,7 +3,8 @@ debian/qtpass*
 debian/files
 build-stamp
 qtpass
-QtPass.*
+QtPass.app
+QtPass.dmg
 qtpass.pro.user
 qtpass.xcodeproj/project.xcworkspace/xcuserdata/*
 qtpass.xcodeproj/xcuserdata/*

.travis.yml

@@ -1,40 +1,62 @@
 language: cpp
-sudo: false
+dist: trusty
+sudo: true
 os:
 - linux
 - osx
 compiler:
 - gcc
 - clang
-addons:
-  apt:
-    packages:
-    - qt5-default
-install:
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5;
-  fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=$PATH:/usr/local/opt/qt5/bin;
-  fi
 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-qt57-trusty; fi
 addons:
   coverity_scan:
     project:
-      name: "IJHack/qtpass"
-      description: "Build submitted via Travis CI"
-    notification_email: brouwer@annejan.com
-    build_command_prepend: "qmake; make clean"
-    build_command:   "make"
+      name: IJHack/qtpass
+      description: Build submitted via Travis CI
+    notification_email: travis@qtpass.org
+    build_command_prepend: qmake; make clean
+    build_command: make
     branch_pattern: coverity_scan
+install:
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew unlink node; brew install node; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=$PATH:/usr/local/opt/qt5/bin; fi
+- 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 qt57base qt57tools qt57svg; fi
+before_script:
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt57/bin/qt57-env.sh; fi
 script:
 - qmake -v
 - qmake -Wall qtpass.pro
 - make -j$(nproc)
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt src/QtPass.app; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/CONTRIBUTING\.md/https:\/\/qtpass.org\/docs\/md_CONTRIBUTING.html/' < README.faq > README.contrib; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/\[\!.*//' < README.contrib > README.clean; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION  qtpass.pri | cut -d " " -f 6).dmg; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION  qtpass.pri | cut -d " " -f 6); fi
 notifications:
   irc:
     channels:
     - chat.freenode.net#IJhack
     on_success: change
     on_failure: always
+deploy:
+  provider: releases
+  api_key:
+    secure: O6LAl2R5QIe/mgQwG5/pzbdC8gS58wtGVF2ebTVGgYsCgY0nRjLZ19H7BiQrYjbbXs8yw6cQjA+xbxNiVsIVs+Dx9j/fy2JOBeBTrGijlWLcJPT6/Ab65EjI2T96XvI8/YejRmbgjIdXFfuKtD/V4MM12LrvrvktwJp00G9l1Go=
+  file: "qtpass-$VERSION.dmg"
+  on:
+    repo: IJHack/qtpass
+    tags: true
+    condition: $TRAVIS_OS_NAME = osx && $CC = clang
+  skip_cleanup: true
+

CONTRIBUTING.md

@@ -21,3 +21,7 @@ Qt Linguist has very nice in-context translation options [for translators](https
 ## IRC
 
 For questions or brainstorming about features please join #ijhack on freenode.
+
+## Gitter
+
+Or if you prefer to use [gitter](https://gitter.im/IJHack/qtpass)