From 130b058352077b88f8839871f88c226e3e1fa705 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Tue, 4 Feb 2020 16:08:42 +0100
Subject: [PATCH] Add multipage example to pdf.pro; work with 5.14; fix
main.cpp
- build the multipage example by default
- don't import anything that won't work with Qt 5.14
- set application attributes before creating an instance
(to fix the warning about that)
Change-Id: I265f49ca75cae1908d4c23848cba8c42e5e3824b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
examples/pdf/multipage/main.cpp | 3 ++-
examples/pdf/pdf.pro | 2 +-
examples/pdf/pdfviewer/main.cpp | 2 +-
examples/pdf/pdfviewer/viewer.qml | 10 +++++-----
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/examples/pdf/multipage/main.cpp b/examples/pdf/multipage/main.cpp
index 451521f80..7b766d77e 100644
--- a/examples/pdf/multipage/main.cpp
+++ b/examples/pdf/multipage/main.cpp
@@ -53,10 +53,11 @@
int main(int argc, char* argv[])
{
- QApplication app(argc, argv);
QCoreApplication::setApplicationName("Qt Quick Multi-page PDF Viewer Example");
QCoreApplication::setOrganizationName("QtProject");
QCoreApplication::setApplicationVersion(QT_VERSION_STR);
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QApplication app(argc, argv);
QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml")));
diff --git a/examples/pdf/pdf.pro b/examples/pdf/pdf.pro
index 45df33e46..7130f3560 100644
--- a/examples/pdf/pdf.pro
+++ b/examples/pdf/pdf.pro
@@ -1,3 +1,3 @@
TEMPLATE=subdirs
-SUBDIRS += pdfviewer
+SUBDIRS += pdfviewer multipage
diff --git a/examples/pdf/pdfviewer/main.cpp b/examples/pdf/pdfviewer/main.cpp
index 6b94a3de1..639b11825 100644
--- a/examples/pdf/pdfviewer/main.cpp
+++ b/examples/pdf/pdfviewer/main.cpp
@@ -53,11 +53,11 @@
int main(int argc, char* argv[])
{
- QApplication app(argc, argv);
QCoreApplication::setApplicationName("Qt Quick PDF Viewer Example");
QCoreApplication::setOrganizationName("QtProject");
QCoreApplication::setApplicationVersion(QT_VERSION_STR);
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QApplication app(argc, argv);
QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml")));
diff --git a/examples/pdf/pdfviewer/viewer.qml b/examples/pdf/pdfviewer/viewer.qml
index b0cd8985d..a8e581a45 100644
--- a/examples/pdf/pdfviewer/viewer.qml
+++ b/examples/pdf/pdfviewer/viewer.qml
@@ -47,12 +47,12 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick 2.14
+import QtQuick.Controls 2.14
+import QtQuick.Layouts 1.14
import QtQuick.Pdf 5.15
-import QtQuick.Shapes 1.15
-import QtQuick.Window 2.15
+import QtQuick.Shapes 1.14
+import QtQuick.Window 2.14
import Qt.labs.platform 1.1 as Platform
ApplicationWindow {
--
GitLab