13 files changed, 27 insertions, 18 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/doc/qtautomotivesuite/src/external-resources.qdoc b/src/doc/qtautomotivesuite/src/external-resources.qdoc
index 9b58096..d5fa0ff 100644
--- a/src/doc/qtautomotivesuite/src/external-resources.qdoc
+++ b/src/doc/qtautomotivesuite/src/external-resources.qdoc
@@ -76,6 +76,11 @@
 */
 
 /*!
+    \externalpage https://doc.qt.io/QtAutoDeploymentServer/index.html
+    \title Qt Automotive Suite Deployment Server
+*/
+
+/*!
     \externalpage https://doc.qt.io/QtForDeviceCreation/index.html
     \title Qt for Device Creation
 */
diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp
index 43e230f..a82e173 100644
--- a/src/geniviextras/qdltregistration.cpp
+++ b/src/geniviextras/qdltregistration.cpp
@@ -93,8 +93,6 @@ void QDltRegistrationPrivate::registerCategory(const QLoggingCategory *category,
 
 void QDltRegistrationPrivate::registerCategory(CategoryInfo &info)
 {
-    Q_ASSERT_X(m_dltAppRegistered, "registerCategory", "A DLT Application needs to be registered before registering a Logging Category");
-
 #if GENIVIEXTRAS_DEBUG
     std::cout << "REGISTERING CONTEXT " << info.m_ctxName.constData() << std::endl;
 #endif
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/ivimedia/configure.json b/src/ivimedia/configure.json
index ee9d309..33265db 100644
--- a/src/ivimedia/configure.json
+++ b/src/ivimedia/configure.json
@@ -62,7 +62,7 @@
         },
         "media_qtro_simulation_server" : {
             "label": "Mediaplayer Qt Remote Objects Simulation Server",
-            "condition": "features.remoteobjects",
+            "condition": "features.remoteobjects && module.multimedia",
             "output": [ "privateFeature" ]
         },
         "ivimedia" : {
diff --git a/src/plugins/ivimedia/media_qtro/media_qtro.pro b/src/plugins/ivimedia/media_qtro/media_qtro.pro
index 60e6a8a..20b2881 100644
--- a/src/plugins/ivimedia/media_qtro/media_qtro.pro
+++ b/src/plugins/ivimedia/media_qtro/media_qtro.pro
@@ -8,7 +8,7 @@ load(qt_plugin)
 
 DISTFILES += media_qtro.json
 
-QT += ivicore ivimedia remoteobjects iviremoteobjects_helper_private
+QT = ivicore ivimedia remoteobjects iviremoteobjects_helper_private
 
 HEADERS += \
     mediaplugin.h \
diff --git a/src/plugins/ivimedia/media_simulator/media_simulator.pri b/src/plugins/ivimedia/media_simulator/media_simulator.pri
index a99cb8b..d4d2f15 100644
--- a/src/plugins/ivimedia/media_simulator/media_simulator.pri
+++ b/src/plugins/ivimedia/media_simulator/media_simulator.pri
@@ -1,5 +1,5 @@
 QT_FOR_CONFIG += ivimedia-private
-QT       += core ivicore ivimedia sql multimedia
+QT = core ivicore ivimedia sql multimedia
 
 INCLUDEPATH += $$PWD
 
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/vehiclefunctions_qtro/vehiclefunctions_qtro.pro b/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro
index cb828df..009d19d 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro
+++ b/src/plugins/ivivehiclefunctions/vehiclefunctions_qtro/vehiclefunctions_qtro.pro
@@ -1,6 +1,6 @@
 TARGET = vehiclefunction_qtro
 
-QT += core ivicore ivivehiclefunctions
+QT = core ivicore ivivehiclefunctions
 CONFIG += c++11 ivigenerator
 
 CMAKE_MODULE_TESTS = '-'
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro
index 90256dc..ea81268 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro
+++ b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.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/src/tools/media-simulation-server/media-simulation-server.pro b/src/tools/media-simulation-server/media-simulation-server.pro
index 16de556..a8ac1fa 100644
--- a/src/tools/media-simulation-server/media-simulation-server.pro
+++ b/src/tools/media-simulation-server/media-simulation-server.pro
@@ -1,11 +1,13 @@
 TARGET = ivimedia-simulation-server
 TEMPLATE = app
-QT = core ivicore remoteobjects ivimedia iviremoteobjects_helper_private
+
+include($$PWD/../../plugins/ivimedia/media_simulator/media_simulator.pri)
+
+QT += remoteobjects iviremoteobjects_helper_private
 CONFIG += c++11
 
 load(qt_tool)
 
-include($$PWD/../../plugins/ivimedia/media_simulator/media_simulator.pri)
 
 HEADERS += \
     core.h \
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
+}