diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-06-08 16:54:54 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-06-09 09:18:08 +0000 |
commit | 5bfb07cf61d9f8c5d27f4384f5eeec6f3d2af725 (patch) | |
tree | c2ebb58ab8173ef4135eb02ce079724d6c057a42 /examples | |
parent | 2296df32fe13cde7b8a17ae7e72cddcb328ae311 (diff) | |
download | qtivi-5bfb07cf61d9f8c5d27f4384f5eeec6f3d2af725.tar.gz |
Fix the qface-ivi-climate example to work out of the box
The backend plugin needs to be named correctly and placed into
a qtivi folder.
Change-Id: Ib1469d2dadc138fd454ae9e9db00c47c683b71ee
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro | 7 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/demo/demo.pro | 1 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/demo/main.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro b/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro index c0bc8a1..3a41606 100644 --- a/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro +++ b/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro @@ -47,9 +47,12 @@ # SPDX-License-Identifier: BSD-3-Clause TEMPLATE=lib -TARGET = example_ivi_climate -CONFIG += ivigenerator +TARGET = $$qtLibraryTarget(example_ivi_climate) +CONFIG += ivigenerator plugin +macos: CONFIG += debug_and_release build_all + LIBS += -L$$OUT_PWD/../frontend -lQtIviClimateExample +DESTDIR = qtivi CONFIG += warn_off INCLUDEPATH += $$OUT_PWD/../frontend diff --git a/examples/core/qface-ivi-climate/demo/demo.pro b/examples/core/qface-ivi-climate/demo/demo.pro index 857e9d4..31c6258 100644 --- a/examples/core/qface-ivi-climate/demo/demo.pro +++ b/examples/core/qface-ivi-climate/demo/demo.pro @@ -50,6 +50,7 @@ TEMPLATE = app QT += qml quick CONFIG += c++11 +CONFIG -= app_bundle LIBS += -L$$OUT_PWD/../frontend -lQtIviClimateExample INCLUDEPATH += $$OUT_PWD/../frontend diff --git a/examples/core/qface-ivi-climate/demo/main.cpp b/examples/core/qface-ivi-climate/demo/main.cpp index 245bb26..d0dae65 100644 --- a/examples/core/qface-ivi-climate/demo/main.cpp +++ b/examples/core/qface-ivi-climate/demo/main.cpp @@ -52,12 +52,14 @@ #include <QGuiApplication> #include <QQmlApplicationEngine> +#include <QDir> #include <climatemodule.h> int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); + QCoreApplication::addLibraryPath(QDir::current().absoluteFilePath("../backend_simulator")); ClimateModule::registerTypes(); ClimateModule::registerQmlTypes(QLatin1String("IviClimate"), 1, 0); |