diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-06-13 10:21:04 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2017-06-14 07:34:52 +0000 |
| commit | c664c9973e6cabb7f3a77e356cd8855cc3c8b543 (patch) | |
| tree | 30b88b315cc52f7a4194f39aac368c3ac916c20d /examples | |
| parent | 1a951302d3bb15fa154191572642a80acbad750f (diff) | |
| download | qtivi-c664c9973e6cabb7f3a77e356cd8855cc3c8b543.tar.gz | |
Make the qface-ivi-climate example work on all platforms
Task-number: QTAUTO-469
Change-Id: Ifecdd99064e4a068973d0c5f17c1547f398384be
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'examples')
4 files changed, 10 insertions, 6 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 3a41606..23c1bbf 100644 --- a/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro +++ b/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro @@ -51,8 +51,8 @@ TARGET = $$qtLibraryTarget(example_ivi_climate) CONFIG += ivigenerator plugin macos: CONFIG += debug_and_release build_all -LIBS += -L$$OUT_PWD/../frontend -lQtIviClimateExample -DESTDIR = qtivi +LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIviClimateExample) +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 31c6258..980bf42 100644 --- a/examples/core/qface-ivi-climate/demo/demo.pro +++ b/examples/core/qface-ivi-climate/demo/demo.pro @@ -46,13 +46,15 @@ # # SPDX-License-Identifier: BSD-3-Clause +TARGET = qface-ivi-climate TEMPLATE = app QT += qml quick CONFIG += c++11 CONFIG -= app_bundle +DESTDIR = ../ -LIBS += -L$$OUT_PWD/../frontend -lQtIviClimateExample +LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIviClimateExample) INCLUDEPATH += $$OUT_PWD/../frontend SOURCES += main.cpp diff --git a/examples/core/qface-ivi-climate/demo/main.cpp b/examples/core/qface-ivi-climate/demo/main.cpp index d0dae65..245bb26 100644 --- a/examples/core/qface-ivi-climate/demo/main.cpp +++ b/examples/core/qface-ivi-climate/demo/main.cpp @@ -52,14 +52,12 @@ #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); diff --git a/examples/core/qface-ivi-climate/frontend/frontend.pro b/examples/core/qface-ivi-climate/frontend/frontend.pro index 22a754c..7e11573 100644 --- a/examples/core/qface-ivi-climate/frontend/frontend.pro +++ b/examples/core/qface-ivi-climate/frontend/frontend.pro @@ -46,12 +46,16 @@ # # SPDX-License-Identifier: BSD-3-Clause -TARGET = QtIviClimateExample +TARGET = $$qtLibraryTarget(QtIviClimateExample) TEMPLATE = lib CONFIG += ivigenerator +DESTDIR = .. +macos: CONFIG += debug_and_release build_all QT += ivicore ivicore-private qml quick +DEFINES += QT_BUILD_CLIMATE_LIB + QFACE_SOURCES = ../example-ivi-climate.qface target.path = $$[QT_INSTALL_EXAMPLES]/core/qface-ivi-climate/frontend |