Commit Graph

147 Commits

Author SHA1 Message Date
Jonathan White
aba4fa94be Merge remote-tracking branch 'keepassx/master'
# Conflicts:
#	README.md
#	share/translations/keepassx_de.ts
#	src/CMakeLists.txt
#	src/gui/MainWindow.h
2016-02-27 19:11:09 -05:00
Felix Geyer
d6d92ce90a Merge branch '2.0' 2016-02-08 18:13:29 +01:00
Felix Geyer
49f58b4ed8 Prepare 2.0.2 release. 2016-02-02 01:21:39 +01:00
Felix Geyer
d670ef2638 Prepare for 2.0.1 release. 2016-01-31 18:49:35 +01:00
Felix Geyer
ecfbf72a57 Merge branch '2.0' 2015-12-15 21:05:00 +01:00
Felix Geyer
24275d8dc4 Bump version. 2015-12-06 22:19:05 +01:00
Felix Geyer
a408b01111 Add WITH_DEV_BUILD mode.
It disables/warns about deprecated methods.
2015-10-13 22:51:31 +02:00
Felix Geyer
3b2a39fd38 Merge branch '2.0' 2015-09-26 11:44:27 +02:00
Felix Geyer
ee81c7c00e Remove WITH_LTO option.
It's broken and probably not worth the potential again.

Refs #353
2015-09-25 21:34:51 +02:00
Felix Geyer
2e23fb203a Pass -std=c++11 to the C++ compiler unconditionally.
All supported compiler should understand it.
2015-09-12 16:16:18 +02:00
Felix Geyer
7fa0eddc5f Make C++11 mandatory. 2015-09-12 13:55:50 +02:00
Felix Geyer
60daa2b41b Require libgcrypt >= 1.6.0.
Remove our own Salsa20 implementation as libgcrypt ships one
with that version.
2015-09-12 13:51:49 +02:00
Felix Geyer
ec8c0bb3e7 Setup new build dependencies. 2015-09-12 13:51:49 +02:00
Felix Geyer
208b0f39e6 Adapt to QtConcurrent being a separate module now. 2015-09-12 13:51:49 +02:00
Felix Geyer
813c64a055 Port cmake files to Qt 5. 2015-09-12 13:51:49 +02:00
Felix Geyer
95c449481e Prepare beta 2 release. 2015-09-06 23:39:54 +02:00
Felix Geyer
d83fee89bd Fix building WITH_CXX11 on OS X. 2015-09-05 19:03:24 +02:00
Felix Geyer
1226d1dbd5 Prepare next release. 2015-07-18 21:20:38 +02:00
Felix Geyer
6d1ca363af Remove support for clearing the Klipper history.
KDE Plasma 5 doesn't provide the DBus interface anymore and
this avoids the QtDBus dependency.
2015-07-16 20:02:10 +02:00
Ivan
a115bbdc6f Merge branch 'master' of https://github.com/keepassx/keepassx 2015-05-22 21:06:32 -07:00
Felix Geyer
eeb940c0dc Fix plugin path detection when installed with DESTDIR.
This is in no way perfect but should cover most common cases.

Closes #291
2015-05-12 22:24:59 +02:00
Ivan
d70ee509b4 Merge branch 'master' of https://github.com/keepassx/keepassx 2015-04-11 15:41:25 -07:00
Felix Geyer
93ab7eb058 Use CMAKE_INSTALL_DATADIR to look for the data dir. 2015-04-08 18:07:53 +02:00
IvanF
235baa3dcc Merge branch 'master' of https://github.com/keepassx/keepassx
Conflicts:
	README.md
	src/core/Config.cpp
	src/gui/DatabaseTabWidget.cpp
	src/gui/DatabaseTabWidget.h
	src/gui/DatabaseWidget.cpp
	src/gui/DatabaseWidget.h
	src/gui/MainWindow.cpp
	src/gui/MainWindow.h
	src/gui/MainWindow.ui
	src/gui/SearchWidget.ui
	src/gui/SettingsWidget.cpp
	src/gui/SettingsWidgetGeneral.ui
2015-01-29 00:17:39 -08:00
IvanF
f04f4302a2 Deleted local qjson, now using system qjson
Modified CmakeLists to require qjson
Replaced non-standard qjson calls with standard ones
2015-01-28 22:42:02 -08:00
Felix Geyer
4b3a82592c Define QT_NO_DEBUG for build type None.
Debian sets the the build type to None for package builds.
Make sure we don't enable asserts there.

Closes #237
2014-11-04 18:50:59 +01:00
Felix Geyer
b417bf9187 Enable C++11 by default. 2014-06-13 21:33:36 +02:00
Jascha Dachtera
65626f0da2 Merge branch 'master' of https://github.com/keepassx/keepassx
Use SymmetricCipherGcrypt directly in Protocol.cpp to make it work with the latest master
revision.
2014-04-18 13:59:24 +02:00
Felix Geyer
43a1d54bba Prepare 2.0 alpha 6 release. 2014-04-12 15:29:20 +02:00
Keith Bennett
b27ba03d42 Replaced qhttpserver with libmicrohttp.
The qhttpserver seems to be riddled with memory leaks and was
continuously crashing. I don't know Qt well enough to fix it so
I have replaced it with libmicrohttp. This is not nearly as
elegant but it is much more stable.
2014-03-23 17:25:39 +00:00
Felix Geyer
0b6b149351 Use the libgcrypt SALSA20 cipher if available. 2014-01-12 13:42:56 +01:00
Felix Geyer
0cbf59209b Prepare the next alpha release. 2013-12-20 12:41:45 +01:00
Felix Geyer
47b7befd2f Set default build type to RelWithDebInfo. 2013-11-24 22:09:52 +01:00
Felix Geyer
2fcc369c41 Enable the foritfy source build flag only for optimized builds.
https://github.com/keepassx/keepassx/pull/27
2013-11-24 21:40:19 +01:00
Felix Geyer
6504b6f2bd Drop Qt module name from include statements.
This is a preparation to be able to build KeePassX against Qt 5.
2013-10-03 15:18:16 +02:00
Felix Geyer
e1c82a4453 Print a cmake feature log.
This let's users know when the dependnecies for auto-type are missing.
Available only in cmake >= 2.8.3.

Closes #71
2013-06-30 14:07:25 +02:00
Felix Geyer
a505d85792 Fix compatbility with clang 3.2.
Pass --param=ssp-buffer-size=4 to clang instead of
-mllvm -stack-protector-buffer-size=4 which clang 3.2 doesn't seem
to support anymore.
2013-04-30 18:38:44 +02:00
Felix Geyer
fd18bc0330 Use standard GNU install dirs and make them overridable. 2013-04-29 22:17:31 +02:00
Felix Geyer
9e87230102 Use -fvisibility-inlines-hidden only for C++ files.
gcc emits a warning that the flag cannot be used for C.
2013-04-06 17:45:05 +02:00
Felix Geyer
60335452a4 Add compiler flags to hide all symbols by default. 2013-03-30 00:14:32 +01:00
Felix Geyer
98e59215b8 Bump version and update changelog. 2013-03-29 09:46:03 +01:00
Felix Geyer
8d9b209014 Bump version to 2.0 alpha 3. 2012-10-27 10:29:45 +02:00
Felix Geyer
18337927f5 Fix includes for ptrace(PT_DENY_ATTACH, ...). 2012-10-23 17:06:50 +02:00
Felix Geyer
21f1eb2d14 Drop WITH_PIE option as it's broken.
It builds the autotype plugin as a PIE which doesn't work.
2012-10-23 17:05:46 +02:00
Felix Geyer
34f595cc78 Build icon into the main executable on Windows. 2012-10-23 14:52:59 +02:00
Felix Geyer
169e6327ea Disable core dumps and tracing on *nix.
But only when built in release mode.

Closes #4
2012-10-21 12:33:00 +02:00
Felix Geyer
3100c202e8 Install the auto-type plugin. 2012-07-18 21:22:36 +02:00
Felix Geyer
bc207714da Add initial auto-type implementation.
The platform dependent bits are separated in plugins.
A plugin for X11 using Xlib is already done.
2012-07-12 22:33:20 +02:00
Felix Geyer
853d9eaa4a Bump version to alpha 2. 2012-07-02 22:23:20 +02:00
Felix Geyer
a4121f8b5a Set BIN_INSTALL_DIR to "." instead of an empty string on Windows and Mac OS. 2012-07-02 22:13:13 +02:00
Felix Geyer
1bb646fb91 Don't pass -ansi to g++ when WITH_CXX11 is enabled. 2012-07-02 19:52:06 +02:00
Felix Geyer
a9724ad894 Fix building with LTO. 2012-07-02 19:22:26 +02:00
Felix Geyer
af142fc433 Optionally enable C++ 11. 2012-06-29 14:14:58 +02:00
Felix Geyer
f43ad8d062 Support copying username and password to the clipboard. 2012-05-26 16:37:57 +02:00
Felix Geyer
a1a71a88bb Fix cmake file formatting. 2012-05-21 23:37:29 +02:00
Felix Geyer
3bc3bfb15e Support gcc 4.0.
gcc 4.0 doesn't understand -Werror=...
2012-05-21 21:50:48 +02:00
Felix Geyer
fa79da37b6 Support creating Mac OS X bundles that embed all dependencies. 2012-05-21 21:50:40 +02:00
Felix Geyer
ca7c59d313 Fix data path on Mac OS. 2012-05-21 17:55:09 +02:00
Andreas Piesk
7568582b05 compile with QT < 4.7 (RHEL6 an clones) 2012-05-09 22:15:28 +02:00
Felix Geyer
000be1e5be Bump version to 2.0 alpha 1. 2012-05-02 23:06:37 +02:00
Felix Geyer
79b6ff99e4 Mark library include dirs as SYSTEM.
Compilers will suppress warnings from files in those directories.
2012-04-26 12:18:38 +02:00
Felix Geyer
f82de78861 Define QT_NO_DEBUG when no cmake build type has been set. 2012-04-25 16:50:39 +02:00
Felix Geyer
6340ed8993 Add support for building position-independent executables. 2012-04-23 16:27:37 +02:00
Felix Geyer
82f1cbb3c9 Build with -DQT_NO_CAST_TO_ASCII. 2012-04-22 00:55:52 +02:00
Felix Geyer
96146d9e80 Support different C/C++ compiler.
For example gcc as the C compiler and clang for C++.
2012-04-21 19:47:39 +02:00
Felix Geyer
4e5e5c71ca Support gcc Link Time Optimization. 2012-04-18 20:18:48 +02:00
Felix Geyer
af8e21f125 Better handling of compiler flags. 2012-04-18 16:10:40 +02:00
Felix Geyer
123e3766fe Bump minimum cmake version to 2.8.0. 2012-04-18 13:50:15 +02:00
Felix Geyer
3211fee99c Fix typo. 2012-04-14 18:45:16 +02:00
Felix Geyer
dabb1800c6 Pass gcc compiler and linker flags also to clang. 2012-04-14 15:28:52 +02:00
Felix Geyer
a282745efc Add -Wformat=2 to compiler flags. 2012-04-05 18:30:29 +02:00
Felix Geyer
752c720226 Install the keepassx binary and database icons. 2011-12-29 23:50:22 +01:00
Felix Geyer
4da6da8828 Add a GUI unit test. 2011-12-26 19:18:21 +01:00
Felix Geyer
c00e8d64a0 Enable some more hardening flags. 2011-12-22 16:25:50 +01:00
Felix Geyer
7e346de707 Turn format-security warnings into errors. 2011-12-21 23:27:47 +01:00
Felix Geyer
9e56b33190 Clean up CMakeLists.txt. 2011-11-20 11:02:17 +01:00
Felix Geyer
78c5094caa Use add_definitions() instead of appending the flags to CMAKE_CXX_FLAGS. 2011-11-20 10:14:50 +01:00
Felix Geyer
b840b5de6d Don't include the UseQt4 file.
This way we don't needlessly add each Qt module to the include paths.
2011-11-20 10:12:49 +01:00
Felix Geyer
9b46225937 Fix cmake files to use new gcrypt variables. 2011-11-12 14:30:16 +01:00
Felix Geyer
b0bec62c07 Rewrite Gcrypt cmake module. 2011-11-12 12:00:49 +01:00
Felix Geyer
2e84c96ab7 Add linker flags only on Linux. 2011-11-12 01:48:49 +01:00
Felix Geyer
e366daf3ce Define QT_STRICT_ITERATORS. 2011-11-12 01:36:34 +01:00
Kevin van der Vlist
cc1438239c Fixed OpenIndiana (and other SunOS) compilation. 2011-07-09 14:45:22 +02:00
Felix Geyer
b4367a7ea1 Add linker flags only on unix. 2011-07-07 19:03:51 +02:00
Felix Geyer
87ee9b7c85 Add kdbx-extract utility.
It dumps the raw xml string of a kdbx database to stdout.
2011-07-06 20:23:29 +02:00
Felix Geyer
ce834cda46 Add seperate compiler flags for C++ and C files. 2010-11-22 14:57:19 +01:00
Felix Geyer
091985bd8d Add -Wl,--as-needed and -Wl,--no-undefined to the linker flags. 2010-11-21 23:16:56 +01:00
Felix Geyer
230d24a123 No longer use automoc. 2010-11-21 23:06:30 +01:00
Felix Geyer
a9ac4bbf41 Add cmake check to verify that zlib supports the gzip format. 2010-09-24 13:32:05 +02:00
Felix Geyer
7c83033899 Build with -DQT_NO_STL. 2010-09-24 00:30:25 +02:00
Felix Geyer
76da30adda Pass -Wl,--no-add-needed to the linker. 2010-09-23 23:36:25 +02:00
Felix Geyer
b8dfb9cc4d Add support for gzip compressed databases. 2010-09-23 22:27:59 +02:00
Felix Geyer
7cbbf8cf37 Enable even more warnings. 2010-09-19 16:57:40 +02:00
Felix Geyer
1678351d11 Enable and fix more warnings. 2010-09-18 20:31:14 +02:00
Felix Geyer
6a2034fa24 Add crypto classes and tests. Link to libgcrypt. 2010-09-11 19:49:30 +02:00
Felix Geyer
bd1ea05017 Fix parser and add unit tests. 2010-08-13 18:08:06 +02:00
Felix Geyer
3e3c23e4ad Initial import. 2010-08-07 15:10:44 +02:00