[git] GPGME - branch, master, updated. gpgme-1.9.0-93-gb61d0fb

[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  b61d0fbb74f04408dfe8637c719b97217e061a3c (commit)
      from  0a567a94d94cd93c5d88f5db802925c95f0974d0 (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 b61d0fbb74f04408dfe8637c719b97217e061a3c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Dec 11 17:07:10 2017 +0100

    qt: Don't use QDateTime::toSecsSinceEpoch
    
    * lang/qt/src/qgpgmequickjob.cpp (addSubkeyWorker)
    (createWorker): Use toMSecsSinceEpoch instead toSecsSinceEpoch.
    
    --
    toSecsSinceEpoch was only introduced in Qt 5.8.

diff --git a/lang/qt/src/qgpgmequickjob.cpp b/lang/qt/src/qgpgmequickjob.cpp
index 13ec0a9..93027d9 100644
--- a/lang/qt/src/qgpgmequickjob.cpp
+++ b/lang/qt/src/qgpgmequickjob.cpp
@@ -59,7 +59,7 @@ static QGpgMEQuickJob::result_type createWorker(GpgME::Context *ctx,
     auto err = ctx->createKey(uid.toUtf8().constData(),
                               algo,
                               0,
-                              expires.isValid() ? (unsigned long) expires.toSecsSinceEpoch() : 0,
+                              expires.isValid() ? (unsigned long) (expires.toMSecsSinceEpoch() / 1000) : 0,
                               key,
                               flags);
     return std::make_tuple(err, QString(), Error());
@@ -72,7 +72,7 @@ static QGpgMEQuickJob::result_type addSubkeyWorker(GpgME::Context *ctx,
                                                     unsigned int flags)
 {
     auto err = ctx->createSubkey(key, algo,  0,
-                                 expires.isValid() ? (unsigned long) expires.toSecsSinceEpoch() : 0,
+                                 expires.isValid() ? (unsigned long) (expires.toMSecsSinceEpoch() / 1000): 0,
                                  flags);
     return std::make_tuple(err, QString(), Error());
 }

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

Summary of changes:
 lang/qt/src/qgpgmequickjob.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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