Felix Geyer
3b2a39fd38
Merge branch '2.0'
2015-09-26 11:44:27 +02:00
Felix Geyer
bcb54bc38a
Avoid dereferencing QLists.
2015-09-25 21:34:56 +02:00
Felix Geyer
14aac09318
Avoid implicit casts from bool to int.
2015-09-25 21:34:56 +02:00
Felix Geyer
9d42db9849
Mark more methods as override.
2015-09-25 21:34:56 +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
2edf414aa4
Fix compiler warning on OS X and Windows.
2015-09-24 18:45:23 +02:00
Felix Geyer
54f44f5267
Show a better message when trying to open an old database format.
...
Refs #338
2015-09-23 23:16:49 +02:00
Felix Geyer
6ab54bc95a
Check if libXi is installed and explicitly link against it.
2015-09-23 22:26:49 +02:00
Felix Geyer
c8ae31a248
Remove backported Qt5 test macros.
2015-09-23 22:21:21 +02:00
Florian Geyer
66a01e4fef
Better output of translation file paths in cmake message.
2015-09-23 20:15:09 +02:00
Felix Geyer
d559db4fb1
Merge branch '2.0'
2015-09-21 23:23:51 +02:00
Felix Geyer
673dff2268
Auto-Type: Raise target window after showing the select dialog.
...
kwin >= 5.4 (since commit cfa1d61) prefers to focus the main window
instead of following the focus chain.
We ask the window manager nicely to focus the window we want to
type into. kwin seems to follow that (in the default configuration).
2015-09-21 23:12:10 +02:00
Felix Geyer
6f5871434d
Update required version of build-dependencies.
...
Refs #350
2015-09-19 11:28:03 +02:00
Felix Geyer
685f249fd0
Merge remote-tracking branch 'github/pr/128'
...
https://github.com/keepassx/keepassx/pull/128
2015-09-19 11:22:17 +02:00
Nairolf21
26ccd577b5
Update dependencies to build KeepassX
2015-09-18 01:13:53 -07:00
Felix Geyer
bb38be40f6
Enable Ctrl+M shortcut to minimize window on all platforms.
...
Closes #329
2015-09-13 22:33:07 +02:00
Felix Geyer
f236c32063
Clear clipboard when locking databases.
...
Closes #342
2015-09-13 12:38:19 +02:00
Felix Geyer
236edae60b
travis-ci: Backport OS X improvements from master.
2015-09-12 23:35:59 +02:00
Felix Geyer
5a13402b51
Activate window in TestGui.
...
It doesn't seem to get the focus automatically when run inside Xvfb.
QTRY_VERIFY(searchEdit->hasFocus()) failed as a result of this.
2015-09-12 23:12:17 +02:00
Felix Geyer
82aa02a980
travis-ci: Switch to Qt 5.4.2 ppa.
2015-09-12 21:46:15 +02:00
Felix Geyer
3dd98deecc
Use QStandardPaths::DataLocation instead of AppDataLocation.
...
AppDataLocation is only available in Qt >= 5.4.
2015-09-12 18:41:48 +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
625e9a2547
Make TestGui agnostic to added "&" in tab title.
...
Fixes tests on OS X / Qt 5.5.0.
2015-09-12 15:48:38 +02:00
Felix Geyer
aab2b7df1c
travis-ci: Remove conflicting libgcrypt11-dev package.
2015-09-12 15:43:18 +02:00
Felix Geyer
31bd44bec5
travis-ci: Output test failures on OS X.
2015-09-12 15:39:21 +02:00
Felix Geyer
11532b603a
travis-ci: Use more force.
2015-09-12 15:38:48 +02:00
Felix Geyer
523c88b80d
travis-ci: Install libgcrypt from Ubuntu 14.04.
...
This is getting really ugly but we need libgcrypt >= 1.6.
2015-09-12 15:31:24 +02:00
Felix Geyer
7cf1bb7e38
travis-ci: Pass Qt5 installation path to cmake.
2015-09-12 15:26:45 +02:00
Felix Geyer
eb9fdb43c1
travis-ci: install and use gcc 4.7.
...
gcc 4.6 doesn't support all C++11 feature we need.
2015-09-12 15:24:42 +02:00
Felix Geyer
0362f45547
Don't try to install homebrew packages that are already there.
...
brew install <existing package> returns an error code.
2015-09-12 14:43:37 +02:00
Felix Geyer
31f55fdb26
Install cmake binaries provided by upstream.
...
cmake 2.8.7 in Ubuntu 12.04 is too old.
2015-09-12 14:34:59 +02:00
Felix Geyer
26928a63e8
Try to work around travis providing an ancient build environment.
2015-09-12 14:12:27 +02:00
Paultergeist
abacec5787
Fixed compile error on Mac
2015-09-12 14:00:53 +02:00
Benjamin Robin
d84af2def0
Fix the open recent database menu.
...
With at least Qt 5.5 the action text is automatically modified from
/home/ben/db.kdbx to /&home/ben/db.kdbx
So add the path of the database to the action using setData
Signed-off-by: Benjamin Robin <dev@benjarobin.fr>
2015-09-12 14:00:03 +02:00
Felix Geyer
7fa0eddc5f
Make C++11 mandatory.
2015-09-12 13:55:50 +02:00
Felix Geyer
0e85c98d02
Remove backported definitions from Global.h.
2015-09-12 13:51:49 +02:00
Felix Geyer
ae2b27d400
Connect rowsAboutToBeMoved() and rowsMoved() again.
...
Accidentally removed in 4fcce6f98f3d481514825ebdffc024c36bd5389c
2015-09-12 13:51:49 +02:00
Felix Geyer
7c424e1b85
Merge updated modeltest from Qt 5.
2015-09-12 13:51:49 +02:00
Felix Geyer
ba1ca4ec08
Rename x11 auto-type plugin to xcb.
...
This matches what QGuiApplication::platformName() returns.
2015-09-12 13:51:49 +02:00
Felix Geyer
20b13a4a2e
Ger rid of last Qt 4 version check.
2015-09-12 13:51:49 +02:00
Felix Geyer
460b23b1eb
Use QElapsedTimer everywhere.
2015-09-12 13:51:49 +02:00
Felix Geyer
9882f16614
Remove Tools::currentDateTimeUtc().
2015-09-12 13:51:49 +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
d81565df55
qttools5-dev-tools is also required for building on Debian.
2015-09-12 13:51:49 +02:00
Felix Geyer
e2ac176d3c
Remove second argument of QSKIP call.
...
Has been removed in Qt 5.
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
b904fe5acd
Adapt X11 auto-type plugin to handle xcb instead of xlib events.
2015-09-12 13:51:49 +02:00
Felix Geyer
3b07098731
Port native event filter to Qt 5.
2015-09-12 13:51:49 +02:00
Felix Geyer
03a330a4dd
Port Tools::platform() to Qt 5.
...
The Q_WS_* definitions are gone.
2015-09-12 13:51:49 +02:00
Felix Geyer
6502da549b
Fix build failure in AutoTypePlatformX11::SendEvent().
2015-09-12 13:51:49 +02:00