diff options
| -rw-r--r-- | examples/examples.pro | 8 | ||||
| -rw-r--r-- | src/imports/core/core.pro | 4 | ||||
| -rw-r--r-- | src/imports/media/media.pro | 4 | ||||
| -rw-r--r-- | src/imports/vehiclefunctions/vehiclefunctions.pro | 4 | ||||
| -rw-r--r-- | src/plugins/ivimedia/media_simulator/media_simulator.pro | 2 | ||||
| -rw-r--r-- | src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro | 2 | ||||
| -rw-r--r-- | src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro | 2 | ||||
| -rw-r--r-- | src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro | 2 | ||||
| -rw-r--r-- | tests/tests.pro | 4 |
9 files changed, 18 insertions, 14 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index baa862b..a8fa56a 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,6 +1,8 @@ TEMPLATE = subdirs -qtHaveModule(ivicore): SUBDIRS += ivicore -qtHaveModule(ivivehiclefunctions): SUBDIRS += ivivehiclefunctions -qtHaveModule(ivimedia): SUBDIRS += ivimedia +qtHaveModule(gui): { + qtHaveModule(ivicore): SUBDIRS += ivicore + qtHaveModule(ivivehiclefunctions): SUBDIRS += ivivehiclefunctions + qtHaveModule(ivimedia): SUBDIRS += ivimedia +} qtHaveModule(geniviextras): SUBDIRS += geniviextras diff --git a/src/imports/core/core.pro b/src/imports/core/core.pro index 50e75c8..72e014c 100644 --- a/src/imports/core/core.pro +++ b/src/imports/core/core.pro @@ -6,11 +6,11 @@ IMPORT_VERSION = 1.0 SOURCES += \ plugin.cpp -QT += ivicore +QT = ivicore # Automatically update the qmltypes file to keep it up to date with API changes # This only works for non-prefix builds and not when cross-compiling -!cross_compile:!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { +!cross_compile:!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)):qtHaveModule(quick) { first.target = first first.depends += qmltypes QMAKE_EXTRA_TARGETS += first diff --git a/src/imports/media/media.pro b/src/imports/media/media.pro index 703076b..9148530 100644 --- a/src/imports/media/media.pro +++ b/src/imports/media/media.pro @@ -6,11 +6,11 @@ IMPORT_VERSION = 1.0 SOURCES += \ plugin.cpp -QT += ivicore ivimedia +QT = ivicore ivimedia # Automatically update the qmltypes file to keep it up to date with API changes # This only works for non-prefix builds and not when cross-compiling -!cross_compile:!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { +!cross_compile:!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)):qtHaveModule(quick) { first.target = first first.depends += qmltypes QMAKE_EXTRA_TARGETS += first diff --git a/src/imports/vehiclefunctions/vehiclefunctions.pro b/src/imports/vehiclefunctions/vehiclefunctions.pro index 1acc47d..7384bb6 100644 --- a/src/imports/vehiclefunctions/vehiclefunctions.pro +++ b/src/imports/vehiclefunctions/vehiclefunctions.pro @@ -6,11 +6,11 @@ IMPORT_VERSION = 1.0 SOURCES += \ plugin.cpp -QT += ivicore ivivehiclefunctions +QT = ivicore ivivehiclefunctions # Automatically update the qmltypes file to keep it up to date with API changes # This only works for non-prefix builds and not when cross-compiling -!cross_compile:!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) { +!cross_compile:!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)):qtHaveModule(quick) { first.target = first first.depends += qmltypes QMAKE_EXTRA_TARGETS += first diff --git a/src/plugins/ivimedia/media_simulator/media_simulator.pro b/src/plugins/ivimedia/media_simulator/media_simulator.pro index 1fa1f1c..c7ad72b 100644 --- a/src/plugins/ivimedia/media_simulator/media_simulator.pro +++ b/src/plugins/ivimedia/media_simulator/media_simulator.pro @@ -5,7 +5,7 @@ PLUGIN_TYPE = qtivi PLUGIN_EXTENDS = ivimedia PLUGIN_CLASS_NAME = MediaPlugin -QT += core ivicore ivimedia sql multimedia +QT = core ivicore ivimedia sql multimedia load(qt_plugin) diff --git a/src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro b/src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro index e2cd5a7..2ab3278 100644 --- a/src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro +++ b/src/plugins/ivimedia/media_simulator_mpris/media_simulator_mpris.pro @@ -5,7 +5,7 @@ PLUGIN_TYPE = qtivi PLUGIN_EXTENDS = ivimedia PLUGIN_CLASS_NAME = MPrisMediaPlugin -QT += core ivicore ivimedia dbus +QT = core ivicore ivimedia dbus load(qt_plugin) diff --git a/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro b/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro index 5c44c49..c9810f3 100644 --- a/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro +++ b/src/plugins/ivimedia/tuner_simulator/tuner_simulator.pro @@ -4,7 +4,7 @@ PLUGIN_TYPE = qtivi PLUGIN_EXTENDS = ivimedia PLUGIN_CLASS_NAME = TunerPlugin -QT += core ivicore ivimedia +QT = core ivicore ivimedia load(qt_plugin) diff --git a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro index c2f3ff3..2d912a7 100644 --- a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro +++ b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro @@ -1,6 +1,6 @@ TARGET = vehiclefunction_simulator -QT += core ivicore ivivehiclefunctions +QT = core ivicore ivivehiclefunctions CONFIG += c++11 ivigenerator CMAKE_MODULE_TESTS = '-' diff --git a/tests/tests.pro b/tests/tests.pro index 2ede516..432c5cf 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,3 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = auto +qtHaveModule(gui): { + SUBDIRS = auto +} |