Commit 130b0583 authored by Shawn Rutledge's avatar Shawn Rutledge
Browse files

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: default avatarShawn Rutledge <shawn.rutledge@qt.io>
Showing with 9 additions and 8 deletions
...@@ -53,10 +53,11 @@ ...@@ -53,10 +53,11 @@
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
QApplication app(argc, argv);
QCoreApplication::setApplicationName("Qt Quick Multi-page PDF Viewer Example"); QCoreApplication::setApplicationName("Qt Quick Multi-page PDF Viewer Example");
QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setOrganizationName("QtProject");
QCoreApplication::setApplicationVersion(QT_VERSION_STR); QCoreApplication::setApplicationVersion(QT_VERSION_STR);
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication app(argc, argv);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml"))); engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml")));
......
TEMPLATE=subdirs TEMPLATE=subdirs
SUBDIRS += pdfviewer SUBDIRS += pdfviewer multipage
...@@ -53,11 +53,11 @@ ...@@ -53,11 +53,11 @@
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
QApplication app(argc, argv);
QCoreApplication::setApplicationName("Qt Quick PDF Viewer Example"); QCoreApplication::setApplicationName("Qt Quick PDF Viewer Example");
QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setOrganizationName("QtProject");
QCoreApplication::setApplicationVersion(QT_VERSION_STR); QCoreApplication::setApplicationVersion(QT_VERSION_STR);
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication app(argc, argv);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml"))); engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml")));
......
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls 2.14
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.14
import QtQuick.Pdf 5.15 import QtQuick.Pdf 5.15
import QtQuick.Shapes 1.15 import QtQuick.Shapes 1.14
import QtQuick.Window 2.15 import QtQuick.Window 2.14
import Qt.labs.platform 1.1 as Platform import Qt.labs.platform 1.1 as Platform
ApplicationWindow { ApplicationWindow {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment