Merge remote-tracking branch 'origin/wip/qtpdf' into 5.15v5.15.0-beta1

The feature set is mostly in place (except for some known shortcomings)
and we need the merge to build it on iOS.

Task-number: QTBUG-69519
Change-Id: Ib1ac82a9a7e0830d98d1c4327a1b15d4d7f4d4c1

1 files changed, 3 insertions, 1 deletions

diff --git a/examples/pdf/pdfviewer/main.cpp b/examples/pdf/pdfviewer/main.cpp
index 6b94a3de1..5f65e3061 100644
--- a/examples/pdf/pdfviewer/main.cpp
+++ b/examples/pdf/pdfviewer/main.cpp
@@ -53,17 +53,19 @@
 
 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")));
     if (app.arguments().count() > 1) {
         QUrl toLoad = QUrl::fromUserInput(app.arguments().at(1));
         engine.rootObjects().first()->setProperty("source", toLoad);
+    } else {
+        engine.rootObjects().first()->setProperty("source", QStringLiteral("resources/test.pdf"));
     }
 
     return app.exec();