Require the newer qt5 provided by the new base CI

5 files changed, 8 insertions, 12 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1cac481..ced2664f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,7 +154,7 @@ else()
 endif()
 
 if (ENABLE_QT5)
-  find_package(Qt5Core 5.5)  # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this
+  find_package(Qt5Core 5.9)  # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this
   find_package(Qt5Gui)
   find_package(Qt5Xml)
   find_package(Qt5Widgets)
diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
index 58b42f5e..64e81601 100644
--- a/qt5/CMakeLists.txt
+++ b/qt5/CMakeLists.txt
@@ -5,7 +5,7 @@ if(ENABLE_QT_STRICT_ITERATORS)
   add_definitions(-DQT_STRICT_ITERATORS)
 endif()
 
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050900)
 add_definitions(-DQT_NO_DEPRECATED_WARNINGS)
 
 add_subdirectory(src)
diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc
index 58b06c8f..336a395b 100644
--- a/qt5/src/poppler-annotation.cc
+++ b/qt5/src/poppler-annotation.cc
@@ -1371,7 +1371,7 @@ void Annotation::setModificationDate(const QDateTime &date)
 
     if (d->pdfAnnot) {
         if (date.isValid()) {
-            const time_t t = date.toTime_t();
+            const time_t t = date.toSecsSinceEpoch();
             GooString *s = timeToDateString(&t);
             d->pdfAnnot->setModified(s);
             delete s;
@@ -1408,7 +1408,7 @@ void Annotation::setCreationDate(const QDateTime &date)
     AnnotMarkup *markupann = dynamic_cast<AnnotMarkup *>(d->pdfAnnot);
     if (markupann) {
         if (date.isValid()) {
-            const time_t t = date.toTime_t();
+            const time_t t = date.toSecsSinceEpoch();
             GooString *s = timeToDateString(&t);
             markupann->setDate(s);
             delete s;
diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc
index d83e66af..b7c8213b 100644
--- a/qt5/src/poppler-form.cc
+++ b/qt5/src/poppler-form.cc
@@ -958,8 +958,8 @@ static CertificateInfoPrivate *createCertificateInfoPrivate(const X509Certificat
         certPriv->nick_name = ci->getNickName().c_str();
 
         X509CertificateInfo::Validity certValidity = ci->getValidity();
-        certPriv->validity_start = QDateTime::fromTime_t(certValidity.notBefore, Qt::UTC);
-        certPriv->validity_end = QDateTime::fromTime_t(certValidity.notAfter, Qt::UTC);
+        certPriv->validity_start = QDateTime::fromSecsSinceEpoch(certValidity.notBefore, Qt::UTC);
+        certPriv->validity_end = QDateTime::fromSecsSinceEpoch(certValidity.notAfter, Qt::UTC);
 
         const X509CertificateInfo::PublicKeyInfo &pkInfo = ci->getPublicKeyInfo();
         certPriv->public_key = QByteArray(pkInfo.publicKey.c_str(), pkInfo.publicKey.getLength());
@@ -978,7 +978,7 @@ static CertificateInfoPrivate *createCertificateInfoPrivate(const X509Certificat
 SignatureValidationInfo FormFieldSignature::validate(int opt, const QDateTime &validationTime) const
 {
     FormWidgetSignature *fws = static_cast<FormWidgetSignature *>(m_formData->fm);
-    const time_t validationTimeT = validationTime.isValid() ? validationTime.toTime_t() : -1;
+    const time_t validationTimeT = validationTime.isValid() ? validationTime.toSecsSinceEpoch() : -1;
     SignatureInfo *si = fws->validateSignature(opt & ValidateVerifyCertificate, opt & ValidateForceRevalidation, validationTimeT);
 
     // get certificate info
diff --git a/qt5/tests/poppler-forms.cpp b/qt5/tests/poppler-forms.cpp
index 1e0ceedb..c2175be8 100644
--- a/qt5/tests/poppler-forms.cpp
+++ b/qt5/tests/poppler-forms.cpp
@@ -259,11 +259,7 @@ int main(int argc, char **argv)
                     else
                         std::cout << "\t\t\tSignerName: "
                                   << "(null)" << std::endl;
-                    // http://doc.qt.io/qt-5/qdatetime.html#fromTime_t-1
-                    // Requires Qt 5.2 -> configure.ac update
-                    // QDateTime::fromTime_t(svi->signingTime(), Qt::UTC).toString();
-                    QDateTime sviTime;
-                    sviTime.setTime_t(svi.signingTime());
+                    const QDateTime sviTime = QDateTime::fromSecsSinceEpoch(svi.signingTime(), Qt::UTC);
                     std::cout << "\t\t\tSigningTime: " << sviTime.toString() << std::endl;
                 } break;
                 }