[git] GPGME - branch, master, updated. gpgme-1.6.0-331-gd480f6b

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  d480f6b701894f78f3f4016d69c0e3b87939930b (commit)
      from  7b9e6ea376d04fb4694ed22369abaae92ce3ec86 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d480f6b701894f78f3f4016d69c0e3b87939930b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Sep 12 10:52:10 2016 +0200

    qt: Fix some includes
    
    * lang/qt/src/qgpgmekeyformailboxjob.cpp: Explicitly include
    QStringList.
    * lang/qt/tests/t-support.h, lang/qt/tests/t-support.cpp: Move
    includes into impl. Explicitly include QDir.
    
    --
    This fixes build against Qt versions where the includes are less
    implicit.

diff --git a/lang/qt/src/qgpgmekeyformailboxjob.cpp b/lang/qt/src/qgpgmekeyformailboxjob.cpp
index 0702a36..803d0e6 100644
--- a/lang/qt/src/qgpgmekeyformailboxjob.cpp
+++ b/lang/qt/src/qgpgmekeyformailboxjob.cpp
@@ -33,6 +33,8 @@
 #include "qgpgmekeyformailboxjob.h"
 #include "qgpgmekeylistjob.h"
 
+#include <QStringList>
+
 #include <tuple>
 
 using namespace GpgME;
diff --git a/lang/qt/tests/t-support.cpp b/lang/qt/tests/t-support.cpp
index 2b21ce7..86372f7 100644
--- a/lang/qt/tests/t-support.cpp
+++ b/lang/qt/tests/t-support.cpp
@@ -33,6 +33,11 @@
 
 #include <QTest>
 
+#include <QProcess>
+#include <QCoreApplication>
+#include <QObject>
+#include <QDir>
+
 void QGpgMETest::initTestCase()
 {
     const QString gpgHome = qgetenv("GNUPGHOME");
diff --git a/lang/qt/tests/t-support.h b/lang/qt/tests/t-support.h
index 74163b1..59d9a4d 100644
--- a/lang/qt/tests/t-support.h
+++ b/lang/qt/tests/t-support.h
@@ -32,9 +32,6 @@
 #define T_SUPPORT_H
 
 #include "interfaces/passphraseprovider.h"
-#include <QtGlobal>
-#include <QProcess>
-#include <QCoreApplication>
 #include <QObject>
 
 namespace GpgME

-----------------------------------------------------------------------

Summary of changes:
 lang/qt/src/qgpgmekeyformailboxjob.cpp | 2 ++
 lang/qt/tests/t-support.cpp            | 5 +++++
 lang/qt/tests/t-support.h              | 3 ---
 3 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org