From 278839a14994364f7977f66c1b2bc80f4d9aea49 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 10 Jan 2019 14:27:11 +0100 Subject: Change the qface examples to only build the configuration which is needed As long as the examples are not using frameworks on osx, it is better to only build the configuration which is needed, instead of building debug_and_release for the plugin and the libs. Not using frameworks could lead to loading a wrong plugin version when the application is build in debug mode, but the frameworks used are in release mode (or vice versa). Change-Id: Id5da6adafe5091edc489c22f36bc059542db2098 Reviewed-by: Robert Griebl --- .../qface-ivi-addressbook/backend_simulator/backend_simulator.pro | 1 - examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro | 2 +- .../ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro | 1 - examples/ivicore/qface-ivi-climate/frontend/frontend.pro | 2 +- examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro | 1 - examples/ivicore/qface-ivi-remote/frontend/frontend.pro | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro index 38e65e7..a65f7d5 100644 --- a/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-ivi-addressbook/backend_simulator/backend_simulator.pro @@ -1,6 +1,5 @@ TEMPLATE=lib TARGET = $$qtLibraryTarget(example_ivi_addressbook) -macos: CONFIG += debug_and_release build_all QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") diff --git a/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro b/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro index bbcaeb5..9008434 100644 --- a/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-addressbook/frontend/frontend.pro @@ -1,7 +1,7 @@ TARGET = $$qtLibraryTarget(QtIviAdressBookExample) TEMPLATE = lib DESTDIR = .. -macos: CONFIG += debug_and_release build_all + QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") QT += ivicore ivicore-private qml quick diff --git a/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro index 42f0193..c38cb8c 100644 --- a/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro +++ b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro @@ -1,6 +1,5 @@ TEMPLATE=lib TARGET = $$qtLibraryTarget(example_ivi_climate) -macos: CONFIG += debug_and_release build_all QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") diff --git a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro index f76702e..1eb1145 100644 --- a/examples/ivicore/qface-ivi-climate/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro @@ -1,7 +1,7 @@ TARGET = $$qtLibraryTarget(QtIviClimateExample) TEMPLATE = lib DESTDIR = .. -macos: CONFIG += debug_and_release build_all + #! [0] QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") diff --git a/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro b/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro index ff26393..7cee6be 100644 --- a/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro +++ b/examples/ivicore/qface-ivi-remote/backend_qtro/backend_qtro.pro @@ -1,6 +1,5 @@ TEMPLATE=lib TARGET = $$qtLibraryTarget(example_ivi_remote) -macos: CONFIG += debug_and_release build_all QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") diff --git a/examples/ivicore/qface-ivi-remote/frontend/frontend.pro b/examples/ivicore/qface-ivi-remote/frontend/frontend.pro index 8fe5732..dc3e04c 100644 --- a/examples/ivicore/qface-ivi-remote/frontend/frontend.pro +++ b/examples/ivicore/qface-ivi-remote/frontend/frontend.pro @@ -1,7 +1,7 @@ TARGET = $$qtLibraryTarget(QtIviRemoteExample) TEMPLATE = lib DESTDIR = .. -macos: CONFIG += debug_and_release build_all + #! [0] QT_FOR_CONFIG += ivicore !qtConfig(ivigenerator): error("No ivigenerator available") -- cgit v1.2.1