diff options
author | Dominik Holland <dominik.holland@qt.io> | 2020-01-29 16:52:12 +0100 |
---|---|---|
committer | Dominik Holland <dominik.holland@qt.io> | 2020-01-29 17:03:03 +0100 |
commit | 89d3ea0c02f64173d47a7d1def16de22c3361158 (patch) | |
tree | 59d90e344ef55f353e9fee2f83c6913c4c885a0f /examples | |
parent | 2cbee7815a6be32d3ce367d6109451049fda061d (diff) | |
download | qtivi-89d3ea0c02f64173d47a7d1def16de22c3361158.tar.gz |
Fix building without widgets
Change-Id: I6442a6c1db7724febac1afffd52221d96adb8309
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/ivimedia/mediaplayer/main.cpp | 4 | ||||
-rw-r--r-- | examples/ivimedia/mediaplayer/mediaplayer.pro | 2 | ||||
-rw-r--r-- | examples/ivimedia/tuner/main.cpp | 4 | ||||
-rw-r--r-- | examples/ivimedia/tuner/tuner.pro | 2 | ||||
-rw-r--r-- | examples/ivivehiclefunctions/climate_qml/climate_qml.pro | 2 | ||||
-rw-r--r-- | examples/ivivehiclefunctions/climate_qml/main.cpp | 4 | ||||
-rw-r--r-- | examples/ivivehiclefunctions/ivivehiclefunctions.pro | 3 | ||||
-rw-r--r-- | examples/ivivehiclefunctions/window_qml/main.cpp | 4 | ||||
-rw-r--r-- | examples/ivivehiclefunctions/window_qml/window_qml.pro | 2 |
9 files changed, 14 insertions, 13 deletions
diff --git a/examples/ivimedia/mediaplayer/main.cpp b/examples/ivimedia/mediaplayer/main.cpp index 192c982..eeffc04 100644 --- a/examples/ivimedia/mediaplayer/main.cpp +++ b/examples/ivimedia/mediaplayer/main.cpp @@ -51,12 +51,12 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include <QQmlApplicationEngine> int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/ivimedia/mediaplayer/mediaplayer.pro b/examples/ivimedia/mediaplayer/mediaplayer.pro index 29517aa..f8f527f 100644 --- a/examples/ivimedia/mediaplayer/mediaplayer.pro +++ b/examples/ivimedia/mediaplayer/mediaplayer.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick widgets ivicore +QT += qml quick ivicore CONFIG += c++11 diff --git a/examples/ivimedia/tuner/main.cpp b/examples/ivimedia/tuner/main.cpp index 192c982..eeffc04 100644 --- a/examples/ivimedia/tuner/main.cpp +++ b/examples/ivimedia/tuner/main.cpp @@ -51,12 +51,12 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include <QQmlApplicationEngine> int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/ivimedia/tuner/tuner.pro b/examples/ivimedia/tuner/tuner.pro index 510cf6e..5a2b6d0 100644 --- a/examples/ivimedia/tuner/tuner.pro +++ b/examples/ivimedia/tuner/tuner.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick widgets ivicore +QT += qml quick ivicore CONFIG += c++11 diff --git a/examples/ivivehiclefunctions/climate_qml/climate_qml.pro b/examples/ivivehiclefunctions/climate_qml/climate_qml.pro index 07ba83d..6c44293 100644 --- a/examples/ivivehiclefunctions/climate_qml/climate_qml.pro +++ b/examples/ivivehiclefunctions/climate_qml/climate_qml.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick widgets +QT += qml quick SOURCES += main.cpp diff --git a/examples/ivivehiclefunctions/climate_qml/main.cpp b/examples/ivivehiclefunctions/climate_qml/main.cpp index 192c982..eeffc04 100644 --- a/examples/ivivehiclefunctions/climate_qml/main.cpp +++ b/examples/ivivehiclefunctions/climate_qml/main.cpp @@ -51,12 +51,12 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include <QQmlApplicationEngine> int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/ivivehiclefunctions/ivivehiclefunctions.pro b/examples/ivivehiclefunctions/ivivehiclefunctions.pro index 121e7e3..19ff424 100644 --- a/examples/ivivehiclefunctions/ivivehiclefunctions.pro +++ b/examples/ivivehiclefunctions/ivivehiclefunctions.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS += \ - climate_widget \ climate_qml \ window_qml + +qtHaveModule(widgets): SUBDIRS += climate_widget diff --git a/examples/ivivehiclefunctions/window_qml/main.cpp b/examples/ivivehiclefunctions/window_qml/main.cpp index 192c982..eeffc04 100644 --- a/examples/ivivehiclefunctions/window_qml/main.cpp +++ b/examples/ivivehiclefunctions/window_qml/main.cpp @@ -51,12 +51,12 @@ ** ****************************************************************************/ -#include <QApplication> +#include <QGuiApplication> #include <QQmlApplicationEngine> int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/ivivehiclefunctions/window_qml/window_qml.pro b/examples/ivivehiclefunctions/window_qml/window_qml.pro index 98368a3..19ec158 100644 --- a/examples/ivivehiclefunctions/window_qml/window_qml.pro +++ b/examples/ivivehiclefunctions/window_qml/window_qml.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += qml quick widgets +QT += qml quick SOURCES += main.cpp |