diff options
author | Janek Bevendorff <janek@jbev.net> | 2018-01-24 15:22:20 +0300 |
---|---|---|
committer | Janek Bevendorff <janek@jbev.net> | 2018-01-24 15:32:37 +0300 |
commit | 7a6850d5fe38b4e19f12d0dc658c8b05ad0ea3bb (patch) | |
tree | 2a0ba9edb265861c423e439abe05e8f3ce8bb9d8 /tests/TestMerge.cpp | |
parent | 6e2500385c8e00c3abe0d903625b23334411c5d4 (diff) |
Move useful QTest template specializations to global header file
Fix KDBX test linker errors on Windows
Diffstat (limited to 'tests/TestMerge.cpp')
-rw-r--r-- | tests/TestMerge.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/TestMerge.cpp b/tests/TestMerge.cpp index d68c4f102..8f38a2f85 100644 --- a/tests/TestMerge.cpp +++ b/tests/TestMerge.cpp @@ -16,12 +16,8 @@ */ #include "TestMerge.h" +#include "TestGlobal.h" -#include <QDebug> -#include <QTest> - -#include "core/Database.h" -#include "core/Group.h" #include "core/Metadata.h" #include "crypto/Crypto.h" |