diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-09-10 11:19:33 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-10-06 09:55:32 +0200 |
| commit | d8c7d966b1ca87eef2a3a9650808a22e4a031bc9 (patch) | |
| tree | b1935e43a513d5c67e0eaa42e684f874a26fe783 /examples | |
| parent | 4ff58f93db3e78d6d309f2648c3dd3152fe63168 (diff) | |
Compile pdf examples
Fix typo in examples.pro and update related pro files.
Drop dependency on widgets in qml examples.
Change-Id: I571069e5b42cc0d0d94d54ce157a6e8636275cae
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 2 | ||||
| -rw-r--r-- | examples/pdf/multipage/main.cpp | 4 | ||||
| -rw-r--r-- | examples/pdf/multipage/multipage.pro | 2 | ||||
| -rw-r--r-- | examples/pdf/pdf.pro | 2 | ||||
| -rw-r--r-- | examples/pdf/pdfviewer/main.cpp | 4 | ||||
| -rw-r--r-- | examples/pdf/pdfviewer/pdfviewer.pro | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index c62d7c04d..a0245a869 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -20,6 +20,6 @@ qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { } qtConfig(build-qtpdf):qtConfig(webengine-qtpdf-support) { - SUDIRS += pdf + SUBDIRS += pdf qtConfig(pdf-widgets): SUBDIRS += pdfwidgets } diff --git a/examples/pdf/multipage/main.cpp b/examples/pdf/multipage/main.cpp index 35aaa8c64..446b2999b 100644 --- a/examples/pdf/multipage/main.cpp +++ b/examples/pdf/multipage/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include <QQmlApplicationEngine> int main(int argc, char* argv[]) @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setApplicationVersion(QT_VERSION_STR); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml"))); diff --git a/examples/pdf/multipage/multipage.pro b/examples/pdf/multipage/multipage.pro index 5df9e653d..bd08ba0de 100644 --- a/examples/pdf/multipage/multipage.pro +++ b/examples/pdf/multipage/multipage.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick pdf widgets svg +QT += qml quick pdf svg SOURCES += main.cpp diff --git a/examples/pdf/pdf.pro b/examples/pdf/pdf.pro index 7130f3560..0ae198ee7 100644 --- a/examples/pdf/pdf.pro +++ b/examples/pdf/pdf.pro @@ -1,3 +1,3 @@ TEMPLATE=subdirs -SUBDIRS += pdfviewer multipage +qtHaveModule(svg): SUBDIRS += pdfviewer multipage diff --git a/examples/pdf/pdfviewer/main.cpp b/examples/pdf/pdfviewer/main.cpp index 5f65e3061..13db2b88a 100644 --- a/examples/pdf/pdfviewer/main.cpp +++ b/examples/pdf/pdfviewer/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include <QQmlApplicationEngine> int main(int argc, char* argv[]) @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setApplicationVersion(QT_VERSION_STR); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml"))); diff --git a/examples/pdf/pdfviewer/pdfviewer.pro b/examples/pdf/pdfviewer/pdfviewer.pro index b8817c9be..a1c578efc 100644 --- a/examples/pdf/pdfviewer/pdfviewer.pro +++ b/examples/pdf/pdfviewer/pdfviewer.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick pdf widgets svg +QT += qml quick pdf svg SOURCES += main.cpp |