Drop Qt module name from include statements.

This is a preparation to be able to build KeePassX against Qt 5.

45 files changed, 75 insertions, 75 deletions

diff --git a/tests/TestArgumentParser.cpp b/tests/TestArgumentParser.cpp
index 60bd63444..fd8d8fd19 100644
--- a/tests/TestArgumentParser.cpp
+++ b/tests/TestArgumentParser.cpp
@@ -17,7 +17,7 @@
 
 #include "TestArgumentParser.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "tests.h"
 #include "core/ArgumentParser.h"
diff --git a/tests/TestArgumentParser.h b/tests/TestArgumentParser.h
index 8fb1e7a0a..9ac8f2a2d 100644
--- a/tests/TestArgumentParser.h
+++ b/tests/TestArgumentParser.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_TEST_ARGUMENT_PARSER_H
 #define KEEPASSX_TEST_ARGUMENT_PARSER_H
 
-#include <QtCore/QObject>
-#include <QtCore/QHash>
+#include <QHash>
+#include <QObject>
 
 class TestArgumentParser : public QObject
 {
diff --git a/tests/TestAutoType.cpp b/tests/TestAutoType.cpp
index cd7b379fe..2fb533595 100644
--- a/tests/TestAutoType.cpp
+++ b/tests/TestAutoType.cpp
@@ -17,8 +17,8 @@
 
 #include "TestAutoType.h"
 
-#include <QtCore/QPluginLoader>
-#include <QtTest/QTest>
+#include <QPluginLoader>
+#include <QTest>
 
 #include "tests.h"
 #include "core/FilePath.h"
diff --git a/tests/TestAutoType.h b/tests/TestAutoType.h
index 9f4445ae9..fba7fde1c 100644
--- a/tests/TestAutoType.h
+++ b/tests/TestAutoType.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTAUTOTYPE_H
 #define KEEPASSX_TESTAUTOTYPE_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class AutoType;
 class AutoTypePlatformInterface;
diff --git a/tests/TestCryptoHash.cpp b/tests/TestCryptoHash.cpp
index 0083c3c5f..8ff3c367d 100644
--- a/tests/TestCryptoHash.cpp
+++ b/tests/TestCryptoHash.cpp
@@ -17,7 +17,7 @@
 
 #include "TestCryptoHash.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "tests.h"
 #include "crypto/Crypto.h"
diff --git a/tests/TestCryptoHash.h b/tests/TestCryptoHash.h
index 1abcd5e1c..05700f349 100644
--- a/tests/TestCryptoHash.h
+++ b/tests/TestCryptoHash.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTCRYPTOHASH_H
 #define KEEPASSX_TESTCRYPTOHASH_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestCryptoHash : public QObject
 {
diff --git a/tests/TestDeletedObjects.cpp b/tests/TestDeletedObjects.cpp
index f12566549..914096cec 100644
--- a/tests/TestDeletedObjects.cpp
+++ b/tests/TestDeletedObjects.cpp
@@ -17,7 +17,7 @@
 
 #include "TestDeletedObjects.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "tests.h"
 #include "core/Database.h"
diff --git a/tests/TestDeletedObjects.h b/tests/TestDeletedObjects.h
index ba905b475..27b70cced 100644
--- a/tests/TestDeletedObjects.h
+++ b/tests/TestDeletedObjects.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTDELETEDOBJECTS_H
 #define KEEPASSX_TESTDELETEDOBJECTS_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class Database;
 
diff --git a/tests/TestEntry.cpp b/tests/TestEntry.cpp
index fdba1c81c..e3c46b100 100644
--- a/tests/TestEntry.cpp
+++ b/tests/TestEntry.cpp
@@ -17,7 +17,7 @@
 
 #include "TestEntry.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "tests.h"
 #include "core/Entry.h"
diff --git a/tests/TestEntry.h b/tests/TestEntry.h
index d873f636c..fe303a609 100644
--- a/tests/TestEntry.h
+++ b/tests/TestEntry.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTENTRY_H
 #define KEEPASSX_TESTENTRY_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class Entry;
 
diff --git a/tests/TestEntryModel.cpp b/tests/TestEntryModel.cpp
index 3ac22c991..fab63db68 100644
--- a/tests/TestEntryModel.cpp
+++ b/tests/TestEntryModel.cpp
@@ -17,8 +17,8 @@
 
 #include "TestEntryModel.h"
 
-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QSignalSpy>
+#include <QTest>
 
 #include "modeltest.h"
 #include "tests.h"
diff --git a/tests/TestEntryModel.h b/tests/TestEntryModel.h
index ffca78eb4..778392f20 100644
--- a/tests/TestEntryModel.h
+++ b/tests/TestEntryModel.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTENTRYMODEL_H
 #define KEEPASSX_TESTENTRYMODEL_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestEntryModel : public QObject
 {
diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp
index cc1cb2414..22845af11 100644
--- a/tests/TestGroup.cpp
+++ b/tests/TestGroup.cpp
@@ -17,9 +17,9 @@
 
 #include "TestGroup.h"
 
-#include <QtCore/QPointer>
-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QPointer>
+#include <QSignalSpy>
+#include <QTest>
 
 #include "tests.h"
 #include "core/Database.h"
diff --git a/tests/TestGroup.h b/tests/TestGroup.h
index eb9017247..40351468b 100644
--- a/tests/TestGroup.h
+++ b/tests/TestGroup.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTGROUP_H
 #define KEEPASSX_TESTGROUP_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestGroup : public QObject
 {
diff --git a/tests/TestGroupModel.cpp b/tests/TestGroupModel.cpp
index 453aa145c..a16386c7d 100644
--- a/tests/TestGroupModel.cpp
+++ b/tests/TestGroupModel.cpp
@@ -17,8 +17,8 @@
 
 #include "TestGroupModel.h"
 
-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QSignalSpy>
+#include <QTest>
 
 #include "modeltest.h"
 #include "tests.h"
diff --git a/tests/TestGroupModel.h b/tests/TestGroupModel.h
index 4711d9faf..093af9e0f 100644
--- a/tests/TestGroupModel.h
+++ b/tests/TestGroupModel.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTGROUPMODEL_H
 #define KEEPASSX_TESTGROUPMODEL_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestGroupModel : public QObject
 {
diff --git a/tests/TestHashedBlockStream.cpp b/tests/TestHashedBlockStream.cpp
index b0c97606b..ab7d386a6 100644
--- a/tests/TestHashedBlockStream.cpp
+++ b/tests/TestHashedBlockStream.cpp
@@ -17,8 +17,8 @@
 
 #include "TestHashedBlockStream.h"
 
-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>
 
 #include "tests.h"
 #include "crypto/Crypto.h"
diff --git a/tests/TestHashedBlockStream.h b/tests/TestHashedBlockStream.h
index e3c6f36aa..d672664cd 100644
--- a/tests/TestHashedBlockStream.h
+++ b/tests/TestHashedBlockStream.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTHASHEDBLOCKSTREAM_H
 #define KEEPASSX_TESTHASHEDBLOCKSTREAM_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestHashedBlockStream : public QObject
 {
diff --git a/tests/TestKeePass1Reader.cpp b/tests/TestKeePass1Reader.cpp
index 2bcd72c7a..3ec4e7830 100644
--- a/tests/TestKeePass1Reader.cpp
+++ b/tests/TestKeePass1Reader.cpp
@@ -17,8 +17,8 @@
 
 #include "TestKeePass1Reader.h"
 
-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>
 
 #include "config-keepassx-tests.h"
 #include "tests.h"
diff --git a/tests/TestKeePass1Reader.h b/tests/TestKeePass1Reader.h
index 4088d9f02..20acd4bb9 100644
--- a/tests/TestKeePass1Reader.h
+++ b/tests/TestKeePass1Reader.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_TESTKEEPASS1READER_H
 #define KEEPASSX_TESTKEEPASS1READER_H
 
-#include <QtCore/QDateTime>
-#include <QtCore/QObject>
+#include <QDateTime>
+#include <QObject>
 
 class Database;
 
diff --git a/tests/TestKeePass2RandomStream.cpp b/tests/TestKeePass2RandomStream.cpp
index e7fee8f47..74a154069 100644
--- a/tests/TestKeePass2RandomStream.cpp
+++ b/tests/TestKeePass2RandomStream.cpp
@@ -17,7 +17,7 @@
 
 #include "TestKeePass2RandomStream.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "tests.h"
 #include "crypto/Crypto.h"
diff --git a/tests/TestKeePass2RandomStream.h b/tests/TestKeePass2RandomStream.h
index f323dfb06..b001a05a2 100644
--- a/tests/TestKeePass2RandomStream.h
+++ b/tests/TestKeePass2RandomStream.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTKEEPASS2RANDOMSTREAM_H
 #define KEEPASSX_TESTKEEPASS2RANDOMSTREAM_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestKeePass2RandomStream : public QObject
 {
diff --git a/tests/TestKeePass2Reader.cpp b/tests/TestKeePass2Reader.cpp
index ee28dfc77..6b1ee1e95 100644
--- a/tests/TestKeePass2Reader.cpp
+++ b/tests/TestKeePass2Reader.cpp
@@ -17,7 +17,7 @@
 
 #include "TestKeePass2Reader.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "config-keepassx-tests.h"
 #include "tests.h"
diff --git a/tests/TestKeePass2Reader.h b/tests/TestKeePass2Reader.h
index 8de873f93..6f090de38 100644
--- a/tests/TestKeePass2Reader.h
+++ b/tests/TestKeePass2Reader.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTKEEPASS2READER_H
 #define KEEPASSX_TESTKEEPASS2READER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestKeePass2Reader : public QObject
 {
diff --git a/tests/TestKeePass2Writer.cpp b/tests/TestKeePass2Writer.cpp
index 233634883..bbc4992a0 100644
--- a/tests/TestKeePass2Writer.cpp
+++ b/tests/TestKeePass2Writer.cpp
@@ -17,8 +17,8 @@
 
 #include "TestKeePass2Writer.h"
 
-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>
 
 #include "tests.h"
 #include "core/Database.h"
diff --git a/tests/TestKeePass2Writer.h b/tests/TestKeePass2Writer.h
index f11403d22..b6a08dc5f 100644
--- a/tests/TestKeePass2Writer.h
+++ b/tests/TestKeePass2Writer.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTKEEPASS2WRITER_H
 #define KEEPASSX_TESTKEEPASS2WRITER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class Database;
 
diff --git a/tests/TestKeePass2XmlReader.cpp b/tests/TestKeePass2XmlReader.cpp
index 186010c4d..3f338fd46 100644
--- a/tests/TestKeePass2XmlReader.cpp
+++ b/tests/TestKeePass2XmlReader.cpp
@@ -17,8 +17,8 @@
 
 #include "TestKeePass2XmlReader.h"
 
-#include <QtCore/QFile>
-#include <QtTest/QTest>
+#include <QFile>
+#include <QTest>
 
 #include "tests.h"
 #include "core/Database.h"
diff --git a/tests/TestKeePass2XmlReader.h b/tests/TestKeePass2XmlReader.h
index 7b0f786a1..6a6c61952 100644
--- a/tests/TestKeePass2XmlReader.h
+++ b/tests/TestKeePass2XmlReader.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_TESTKEEPASS2XMLREADER_H
 #define KEEPASSX_TESTKEEPASS2XMLREADER_H
 
-#include <QtCore/QDateTime>
-#include <QtCore/QObject>
+#include <QDateTime>
+#include <QObject>
 
 class Database;
 
diff --git a/tests/TestKeys.cpp b/tests/TestKeys.cpp
index 107b67417..00b2ffa36 100644
--- a/tests/TestKeys.cpp
+++ b/tests/TestKeys.cpp
@@ -17,8 +17,8 @@
 
 #include "TestKeys.h"
 
-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>
 
 #include "config-keepassx-tests.h"
 #include "tests.h"
diff --git a/tests/TestKeys.h b/tests/TestKeys.h
index d1b62db82..f6677ec7d 100644
--- a/tests/TestKeys.h
+++ b/tests/TestKeys.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTKEYS_H
 #define KEEPASSX_TESTKEYS_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestKeys : public QObject
 {
diff --git a/tests/TestModified.cpp b/tests/TestModified.cpp
index a2c4d6801..864ea1c36 100644
--- a/tests/TestModified.cpp
+++ b/tests/TestModified.cpp
@@ -17,8 +17,8 @@
 
 #include "TestModified.h"
 
-#include <QtTest/QSignalSpy>
-#include <QtTest/QTest>
+#include <QSignalSpy>
+#include <QTest>
 
 #include "tests.h"
 #include "core/Database.h"
diff --git a/tests/TestModified.h b/tests/TestModified.h
index fc9290d1e..ee598addf 100644
--- a/tests/TestModified.h
+++ b/tests/TestModified.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTMODIFIED_H
 #define KEEPASSX_TESTMODIFIED_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestModified : public QObject
 {
diff --git a/tests/TestQSaveFile.cpp b/tests/TestQSaveFile.cpp
index a796bbe5b..bccee0ec4 100644
--- a/tests/TestQSaveFile.cpp
+++ b/tests/TestQSaveFile.cpp
@@ -18,7 +18,7 @@
 
 #include "TestQSaveFile.h"
 
-#include <QtTest/QtTest>
+#include <QtTest>
 
 #include <unistd.h>
 
diff --git a/tests/TestQSaveFile.h b/tests/TestQSaveFile.h
index a21557d02..8e1caf0e1 100644
--- a/tests/TestQSaveFile.h
+++ b/tests/TestQSaveFile.h
@@ -19,7 +19,7 @@
 #ifndef KEEPASSX_TESTQSAVEFILE_H
 #define KEEPASSX_TESTQSAVEFILE_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestQSaveFile : public QObject
 {
diff --git a/tests/TestSymmetricCipher.cpp b/tests/TestSymmetricCipher.cpp
index 5772b9403..b47a00576 100644
--- a/tests/TestSymmetricCipher.cpp
+++ b/tests/TestSymmetricCipher.cpp
@@ -17,8 +17,8 @@
 
 #include "TestSymmetricCipher.h"
 
-#include <QtCore/QBuffer>
-#include <QtTest/QTest>
+#include <QBuffer>
+#include <QTest>
 
 #include "tests.h"
 #include "crypto/Crypto.h"
diff --git a/tests/TestSymmetricCipher.h b/tests/TestSymmetricCipher.h
index 2d8f00bea..e90fe6001 100644
--- a/tests/TestSymmetricCipher.h
+++ b/tests/TestSymmetricCipher.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTSYMMETRICCIPHER_H
 #define KEEPASSX_TESTSYMMETRICCIPHER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class TestSymmetricCipher : public QObject
 {
diff --git a/tests/TestWildcardMatcher.cpp b/tests/TestWildcardMatcher.cpp
index b10a9f7cd..e06125b86 100644
--- a/tests/TestWildcardMatcher.cpp
+++ b/tests/TestWildcardMatcher.cpp
@@ -17,7 +17,7 @@
 
 #include "TestWildcardMatcher.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "tests.h"
 #include "autotype/WildcardMatcher.h"
diff --git a/tests/TestWildcardMatcher.h b/tests/TestWildcardMatcher.h
index 779bb6cb7..a1f8b5f56 100644
--- a/tests/TestWildcardMatcher.h
+++ b/tests/TestWildcardMatcher.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_TESTWILDCARDMATCHER_H
 #define KEEPASSX_TESTWILDCARDMATCHER_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class WildcardMatcher;
 
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index 266f905c3..0d097e304 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -17,16 +17,16 @@
 
 #include "TestGui.h"
 
-#include <QtCore/QTemporaryFile>
-#include <QtTest/QTest>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QToolBar>
-#include <QtGui/QToolButton>
+#include <QAction>
+#include <QApplication>
+#include <QDialogButtonBox>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QTemporaryFile>
+#include <QTest>
+#include <QToolBar>
+#include <QToolButton>
 
 #include "config-keepassx-tests.h"
 #include "tests.h"
diff --git a/tests/gui/TestGui.h b/tests/gui/TestGui.h
index 7e823708d..38e4505cc 100644
--- a/tests/gui/TestGui.h
+++ b/tests/gui/TestGui.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_TESTGUI_H
 #define KEEPASSX_TESTGUI_H
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QObject>
+#include <QAbstractItemModel>
+#include <QObject>
 
 class Database;
 class DatabaseTabWidget;
diff --git a/tests/gui/TestGuiPixmaps.cpp b/tests/gui/TestGuiPixmaps.cpp
index 483fb3c8c..401f68bc3 100644
--- a/tests/gui/TestGuiPixmaps.cpp
+++ b/tests/gui/TestGuiPixmaps.cpp
@@ -17,7 +17,7 @@
 
 #include "TestGuiPixmaps.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "tests.h"
 #include "core/Database.h"
diff --git a/tests/gui/TestGuiPixmaps.h b/tests/gui/TestGuiPixmaps.h
index 99af8a4e8..ef0b664b5 100644
--- a/tests/gui/TestGuiPixmaps.h
+++ b/tests/gui/TestGuiPixmaps.h
@@ -18,9 +18,9 @@
 #ifndef KEEPASSX_TESTGUIPIXMAPS_H
 #define KEEPASSX_TESTGUIPIXMAPS_H
 
-#include <QtCore/QObject>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
+#include <QImage>
+#include <QObject>
+#include <QPixmap>
 
 class TestGuiPixmaps : public QObject
 {
diff --git a/tests/modeltest.cpp b/tests/modeltest.cpp
index a68021a64..19f02d9d5 100644
--- a/tests/modeltest.cpp
+++ b/tests/modeltest.cpp
@@ -41,8 +41,8 @@
 
 #include "modeltest.h"
 
-#include <QtCore/QDebug>
-#include <QtTest/QTest>
+#include <QDebug>
+#include <QTest>
 
 Q_DECLARE_METATYPE ( QModelIndex )
 
diff --git a/tests/modeltest.h b/tests/modeltest.h
index 46c3336e5..9eb343d77 100644
--- a/tests/modeltest.h
+++ b/tests/modeltest.h
@@ -43,9 +43,9 @@
 #ifndef MODELTEST_H
 #define MODELTEST_H
 
-#include <QtCore/QObject>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QStack>
+#include <QAbstractItemModel>
+#include <QObject>
+#include <QStack>
 
 class ModelTest : public QObject
 {
diff --git a/tests/tests.h b/tests/tests.h
index 0714a3b6e..e719a0bff 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -19,7 +19,7 @@
 #ifndef KEEPASSX_TESTS_H
 #define KEEPASSX_TESTS_H
 
-#include <QtTest/QTest>
+#include <QTest>
 
 // backport QTEST_GUILESS_MAIN, QTRY_VERIFY and QTRY_COMPARE from Qt 5