Commit Graph

171 Commits

Author SHA1 Message Date
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
Armin Novak c2b5cde569 Compile time option USE_CREDENTIAL_STORE
This option enables windows credential store support.
2015-12-04 11:41:39 +01:00
Armin Novak e6e828c33b Refactored code to simplify classes.
Job classes:
* Moved common members to parent.
* Made Job constructor protected, only for use by implementing class.

JobPrivate classes:
* Moved common members to parent.
* Made Job constructor protected, only for use by implementing class.
* Unified members where code was duplicated.
2015-12-04 11:41:06 +01:00
Frank Osterfeld ae12da1f6d Merge pull request #49 from TheOneRing/fix_windows10
fix translation install dir on qt5 if qmake reported Qt: Untested Window...
2015-05-04 21:16:26 +02:00
Frank Osterfeld 159acd502d Bump version for master 2015-05-04 21:15:29 +02:00
Frank Osterfeld 5502f09fd1 Bump version, update changelog 2015-05-04 21:12:44 +02:00
Frank Osterfeld 8c9a9d2e5a Fix build 2015-03-31 22:53:31 +02:00
Frank Osterfeld 2c3ef55808 Fix lupdate warnings
Use static calls to tr(), to make the context thingie work.
2015-03-31 22:49:16 +02:00
Frank Osterfeld 672fb092c9 Bump copyright year 2015-03-17 14:31:48 +01:00
Patrick von Reth e4dc97a9b4 fix translation install dir on qt5 if qmake reported Qt: Untested Windows version 10.0 detected! in the error stream 2015-03-04 15:48:16 +01:00
Frank Osterfeld 38cec09f31 Merge pull request #48 from karolherbst/kwallet5
add Kwallet5 support
2015-02-22 22:22:25 +01:00
Karol Herbst ca08e88612 add kwallet5 support 2015-02-22 21:12:18 +01:00
Karol Herbst cfa80f982e move kde detection bits into own function and add plasma5 support by the way 2015-02-22 20:53:00 +01:00
Karol Herbst 5639697fd3 rename kwallet to kwallet4 and add kwallet5 stubs 2015-02-22 20:52:57 +01:00
Frank Osterfeld 7d7544c365 Bump master version 2014-09-01 10:13:18 +02:00
Frank Osterfeld 9f0ffd1c68 Add 0.4 changelog 2014-09-01 10:13:05 +02:00
Frank Osterfeld 6954c941b3 Merge pull request #44 from WeCodePixels/master
Don't request a new kwallet if there already is one
2014-08-18 10:29:11 +02:00
Liviu Cristian Mirea Ghiban 0c37667923 Updated translation files 2014-08-17 18:49:22 +03:00
Liviu Cristian Mirea Ghiban 5200d18453 Fix kdewallet integration 2014-08-17 18:17:25 +03:00
Frank Osterfeld a2437ac789 Merge pull request #39 from xhochy/default-backend
Default to DesktopEnv_Other.
2014-04-08 09:32:01 +02:00