Commit Graph

190 Commits

Author SHA1 Message Date
Frank Osterfeld effb484bdc Merge pull request #87 from hasselmm/plaintextstore
Extract PlainTextStore
2016-08-12 10:53:21 +02:00
Mathias Hasselmann d077333d7c Extract PlainTextStore 2016-08-12 10:34:05 +02:00
Frank Osterfeld ce41cfb639 Merge pull request #85 from hasselmm/nitpicks
Some minor fixes that reduce compiler warnings
2016-08-12 10:27:22 +02:00
Frank Osterfeld 895efaf027 Merge pull request #86 from hasselmm/androidfixes
Don't try to use DBus on Android
2016-08-12 10:26:28 +02:00
Mathias Hasselmann 50f53783cb Don't try to use DBus on Android 2016-08-12 10:23:41 +02:00
Frank Osterfeld ccb73ad80e Merge pull request #84 from stinny/patch-2
Fix compilation error on MSVC2015.
2016-08-12 10:12:37 +02:00
Mathias Hasselmann ddc4b8e7c6 Add missing Q_OBJECT macro
Clazy complains about this.
2016-08-12 10:08:12 +02:00
Mathias Hasselmann bd936d6030 Build fixes for disabled implicit string casts 2016-08-12 10:08:12 +02:00
Michal Švagerka 9eaef83b07 Fix compilation error on MSVC2015.
CREDENTIALW::Comment is LPTSTR (a non-const wchar_t*), whereas wide char literal is const wchat_t*, causing a compilation error.
2016-08-10 10:36:59 +02:00
Frank Osterfeld bdb0732e6f Merge pull request #83 from stinny/patch-1
Silence compilation warnings in keychain_p.h.
2016-08-10 09:13:32 +02:00
Michal Švagerka f5a7921530 Silence compilation warnings in keychain_p.h. 2016-08-09 16:57:28 +02:00
Frank Osterfeld d388400c05 Merge pull request #81 from d1vanov/master
Add C++11 support checking and compiler switches when building with Qt >= 5.7
2016-08-08 10:26:40 +02:00
Dmitry Ivanov bb6b233ef9 Add C++11 support checking and compiler switches when building with Qt >= 5.7
Qt 5.7 is the first release of Qt which makes use of C++11 features within its own codebase, including interfaces in headers. When building something with Qt 5.7, it is required to switch the compiler to the C++11 mode
2016-08-08 07:18:29 +03:00
Frank Osterfeld f7add162c2 Merge pull request #79 from TheOneRing/appvyor
Add appveyor ci support
2016-08-05 12:06:24 +02:00
Hannah von Reth 2fe7d1ae23 Add appveyor ci support 2016-08-05 11:49:49 +02:00
Frank Osterfeld 7be9cef710 Merge pull request #80 from TheOneRing/fix_osx
Fix osx usage
2016-08-05 11:46:04 +02:00
Hannah von Reth d0b91f5dda Fix osx usage 2016-08-05 11:38:59 +02:00
Frank Osterfeld 8f42ff627a Merge pull request #78 from TheOneRing/depend
Use find_dependency to find the dependencies
2016-08-05 11:22:03 +02:00
Hannah von Reth 0eaf3ad1a3 Use find_dependency to find the dependencies 2016-08-05 11:17:44 +02:00
Frank Osterfeld a3f7e52606 Merge pull request #76 from TheOneRing/static
Fix export macro for static builds and export link libraries
2016-08-05 09:55:30 +02:00
Hannah von Reth c6bcd56643 Fix export macro for static builds and export link libraries 2016-08-05 09:52:45 +02:00
Frank Osterfeld c2637a8edd Whitespace fix 2016-07-28 11:37:07 +02:00
Frank Osterfeld 5b6389b567 OS X: Simplify string
Avoid arg() where not necessary. Also fixes the build when disabling
implicit ASCII<->QString conversions.
2016-07-28 11:35:25 +02:00
Frank Osterfeld eae3ce6636 Bump version for master 2016-05-23 11:31:38 +02:00
Frank Osterfeld 83354ae6fa Merge branch '0.7' 2016-05-23 11:31:26 +02:00
Frank Osterfeld 737df764df Update ChangeLog 2016-05-23 11:30:23 +02:00
Frank Osterfeld f4e5335162 Set version to 0.7.0 2016-05-23 11:28:37 +02:00
Frank Osterfeld ae7a33fe85 Set version and bump SO version
0.6 broke BC, so we need to bump the SO version.

Fixes #73
2016-05-23 11:26:36 +02:00
Frank Osterfeld 75b80547fb Merge pull request #70 from OpendTect/master
Added option to make translations optional.
2016-04-07 17:05:38 +02:00
dgb 0786ed6730 Enabled static builds on Windows. 2016-04-06 10:32:55 +02:00
Kristofer Tingdahl a291da01a8 Added qtkeychain_LIBRARIES to test program linker to make it work with static
linkeage.
2016-04-06 09:34:20 +02:00
Kristofer Tingdahl 0b509afc0f Adapted .gitignore to Linux and made it possible to find
Qt5 in custom location.
2016-04-05 16:15:17 +02:00
Kristofer Tingdahl 6ed98a1083 Added headerfiles to project; added .gitignore file 2016-04-05 10:31:42 +02:00
Kristofer Tingdahl 612fbf922e Added option to make translations optional. 2016-04-05 10:00:31 +02:00
Frank Osterfeld 1e7ffafee9 Merge branch '0.6' 2016-04-04 17:56:37 +01:00
Frank Osterfeld 75e7f148f4 Update version and changelog for 0.6.2 2016-04-04 17:52:41 +01:00
Ole-André Rodlie 6d361e673a kwallet: check is reply is valid 2016-04-04 08:38:22 -07:00
Frank Osterfeld 7ccc348b7b Update Changelog 2016-03-31 13:28:18 -07:00
Frank Osterfeld b0a8c18729 Bump version to 0.6.1 2016-03-31 13:26:48 -07:00
Ole-André Rodlie 5be7e75113 fix kwallet 2016-03-31 13:25:03 -07:00
Ole-André Rodlie 36592711fc fix kwallet 2016-03-31 20:59:24 +02:00
Frank Osterfeld 38ba9af503 Bump version in master 2016-03-17 11:02:57 +01:00
Frank Osterfeld 52ba281801 Update changelog and ReadMe 2016-03-17 11:02:15 +01:00
Frank Osterfeld 1422cfadd4 Bump version 2016-03-17 10:56:14 +01:00
Frank Osterfeld 01c14de487 Remove exports
These exports install files to ~/.cmake even when not installing,
affecting other builds searching for qtkeychain (and finding the
files in ~/.cmake but not the build they came from).

Fixes #65
2016-03-17 09:45:49 +01:00
Frank Osterfeld cc1cacad31 Merge pull request #61 from akallabeth/gnome_keyring_fix
Fix gnome keyring binary / text mode password
2016-03-11 11:15:00 +01:00
Frank Osterfeld fa07d5f332 Merge pull request #60 from akallabeth/wchar_windows_fuckup_fix
Fix windows issues with exotic compiler flags.
2016-02-16 06:41:50 +01:00
Armin Novak 36151aacc7 Fix windows issues with exotic compiler flags.
If Qt is compiled with /Zc:wchar_t- no proper wchar_t type
is available. To avoid compilation issues, the platform assumption
of wchar_t being a unsigned short is used to cast to LPCWSTR.
2016-01-12 21:28:12 +01:00
Armin Novak 45725c7986 Added binary / text mode password support.
Added binary password write function.
2016-01-12 13:17:46 +01:00
Frank Osterfeld 08be0593e1 Merge pull request #56 from akallabeth/refactor_win_cred_store
Refactor win cred store
2015-12-04 11:47:36 +01:00