[poppler] 2 commits - qt5/demos qt5/tests

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Dec 23 08:52:29 UTC 2019


 qt5/demos/viewer.cpp             |    6 +++---
 qt5/tests/stress-poppler-dir.cpp |    4 ++--
 qt5/tests/stress-poppler-qt5.cpp |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d8a128ee91fb03c2513614bf262042b71441a789
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Dec 23 09:45:34 2019 +0100

    qVariantFromValue -> QVariant::fromValue

diff --git a/qt5/demos/viewer.cpp b/qt5/demos/viewer.cpp
index d9addc79..4fc8c4fb 100644
--- a/qt5/demos/viewer.cpp
+++ b/qt5/demos/viewer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008-2009, Pino Toscano <pino at kde.org>
- * Copyright (C) 2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, 2019, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2009, Shawn Rutledge <shawn.t.rutledge at gmail.com>
  * Copyright (C) 2013, Fabio D'Urso <fabiodurso at hotmail.it>
  *
@@ -78,11 +78,11 @@ PdfViewer::PdfViewer(QWidget *parent)
     act = settingsRenderMenu->addAction(tr("Splash"));
     act->setCheckable(true);
     act->setChecked(true);
-    act->setData(qVariantFromValue(0));
+    act->setData(QVariant::fromValue(0));
     m_settingsRenderBackendGrp->addAction(act);
     act = settingsRenderMenu->addAction(tr("Arthur"));
     act->setCheckable(true);
-    act->setData(qVariantFromValue(1));
+    act->setData(QVariant::fromValue(1));
     m_settingsRenderBackendGrp->addAction(act);
     connect(m_settingsRenderBackendGrp, &QActionGroup::triggered,
             this, &PdfViewer::slotRenderBackend);
commit b278cab777aeb181c15cc5623f3fdf38347a5a57
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Dec 23 09:43:29 2019 +0100

    qt5: QTime + elapsed -> QElapsedTimer

diff --git a/qt5/tests/stress-poppler-dir.cpp b/qt5/tests/stress-poppler-dir.cpp
index f9d3ce59..0e13e400 100644
--- a/qt5/tests/stress-poppler-dir.cpp
+++ b/qt5/tests/stress-poppler-dir.cpp
@@ -1,6 +1,6 @@
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
-#include <QtCore/QTime>
+#include <QtCore/QElapsedTimer>
 #include <QtWidgets/QApplication>
 #include <QtGui/QImage>
 
@@ -12,7 +12,7 @@ int main( int argc, char **argv )
 {
     QApplication a( argc, argv );               // QApplication required!
 
-    QTime t;
+    QElapsedTimer t;
     t.start();
 
     QDir directory( argv[1] );
diff --git a/qt5/tests/stress-poppler-qt5.cpp b/qt5/tests/stress-poppler-qt5.cpp
index a7ec5064..25639e53 100644
--- a/qt5/tests/stress-poppler-qt5.cpp
+++ b/qt5/tests/stress-poppler-qt5.cpp
@@ -1,6 +1,6 @@
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
-#include <QtCore/QTime>
+#include <QtCore/QElapsedTimer>
 #include <QtWidgets/QApplication>
 #include <QtGui/QImage>
 
@@ -15,7 +15,7 @@ int main( int argc, char **argv )
     Q_UNUSED( argc );
     Q_UNUSED( argv );
 
-    QTime t;
+    QElapsedTimer t;
     t.start();
     QDir dbDir( QStringLiteral( "./pdfdb" ) );
     if ( !dbDir.exists() ) {


More information about the poppler mailing list