Commit Graph

74 Commits

Author SHA1 Message Date
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