Merge remote-tracking branch 'origin/5.7' into 5.8

Change-Id: I8af522cf3a243e307576b038f18372facd8caac9

9 files changed, 66 insertions, 15 deletions

diff --git a/config.tests/dlt/main.cpp b/config.tests/dlt/main.cpp
index f85bf95..5c97048 100644
--- a/config.tests/dlt/main.cpp
+++ b/config.tests/dlt/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <dlt/dlt.h>
+#include <dlt.h>
 
 int main()
 {
diff --git a/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf b/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
index 7c10db4..12f0b83 100644
--- a/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
+++ b/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
@@ -4,6 +4,7 @@ version                       = 1.0.0
 url                           = http://doc.qt.io/QtAutomotiveSuite
 
 sourcedirs                   += src
+imagedirs                    += src/images
 
 qhp.projects                  = QtAutomotiveSuite
 
diff --git a/src/doc/qtautomotivesuite/src/external-resources.qdoc b/src/doc/qtautomotivesuite/src/external-resources.qdoc
index 515f039..5a44bc2 100644
--- a/src/doc/qtautomotivesuite/src/external-resources.qdoc
+++ b/src/doc/qtautomotivesuite/src/external-resources.qdoc
@@ -84,3 +84,13 @@
     \externalpage https://doc.qt.io/QtForDeviceCreation/qtee-installation-guide.html
     \title Qt for Device Creation: Installation Guide
 */
+
+/*!
+    \externalpage https://www.qt.io/download-open-source/#section-2
+    \title Qt Online Installer Download
+*/
+
+/*!
+    \externalpage https://www.qt.io/download/
+    \title Download Qt
+*/
diff --git a/src/doc/qtautomotivesuite/src/images/qtinstaller-qas.png b/src/doc/qtautomotivesuite/src/images/qtinstaller-qas.png
new file mode 100644
index 0000000..4da903d
--- /dev/null
+++ b/src/doc/qtautomotivesuite/src/images/qtinstaller-qas.png
diff --git a/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc b/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
index d1156a6..5e1421e 100644
--- a/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
+++ b/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
@@ -172,10 +172,44 @@
     \title Installing Qt Automotive Suite
     \previouspage {Qt Automotive Suite Overview}{Overview}
 
-    \QAS is based on the \l {Qt for Device Creation} offering. System requirements
-    and install instructions are available here:
+    \QAS is a commercial product and requires a license to install and
+    explore its possibilities. Use the guide on the
+    \l{Download Qt} page to find the license that suits your need. The license you
+    buy is associated with a Qt Account, which is required to install the product.
 
-    \list
-      \li \l {Qt for Device Creation: Installation Guide}
+    \section1 Prerequisites
+
+    \QAS is based on the \l {Qt for Device Creation} offering so the
+    prerequisites are the same for both. For more information about how to install and
+    configure these prerequisites on your development host, see
+    \e {Host-specific Requirements} section in the
+    \l {Qt for Device Creation: Installation Guide}.
+
+    \section1 Install \QAS
+
+    \list 1
+     \li Download the \l{Qt Online Installer Download}{Qt online installer}.
+
+     \note On Linux, the installer needs executable permissions before you
+     can run it.
+
+     \li Run the installer and select \uicontrol Next to get to the Qt account
+     section.
+
+     \li Enter your Qt account credentials and select \uicontrol Next to run
+     a license check against the Qt account.
+
+     \li Select \uicontrol Next again to choose an install path.
+
+     \li Select \uicontrol Next to see available packages to install from.
+
+     \li Select \b{Qt Automotive Suite} and at least one \b Qt version
+     (v5.7 or later) from the list, and follow the instructions to complete
+     the installation.
+
+     \borderedimage qtinstaller-qas.png
     \endlist
+
+    Once the installation is complete, start Qt Creator and try running one of the
+    examples against an automotive target or the Qt Automotive emulator.
 */
diff --git a/src/geniviextras/geniviextras.pro b/src/geniviextras/geniviextras.pro
index ae28c71..1466500 100644
--- a/src/geniviextras/geniviextras.pro
+++ b/src/geniviextras/geniviextras.pro
@@ -9,10 +9,14 @@ OTHER_FILES += \
     $$PWD/doc/*.qdocconf \
     $$PWD/doc/src/*.qdoc
 
+DLT_LIB_PATH = $$system($$pkgConfigExecutable() --variable=libdir automotive-dlt)
 system($$pkgConfigExecutable() --libs \"automotive-dlt >= 2.12.0\"): DEFINES += DLT_VERSION_2_12
 
 !contains(QT_CONFIG, no-pkg-config) {
     PKGCONFIG += automotive-dlt
+
+    #Make sure that the rpath is also added when linking against the lib and is part of the prl
+    LIBS += -Wl,-rpath=$$DLT_LIB_PATH
 } else {
     LIBS += -ldlt
 }
diff --git a/src/geniviextras/qdltregistration_p.h b/src/geniviextras/qdltregistration_p.h
index e91de33..e78e428 100644
--- a/src/geniviextras/qdltregistration_p.h
+++ b/src/geniviextras/qdltregistration_p.h
@@ -42,7 +42,7 @@
 #include <QString>
 #include <QHash>
 
-#include <dlt/dlt.h>
+#include <dlt.h>
 
 //
 //  W A R N I N G
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.cpp b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.cpp
index 149692c..c0635c8 100644
--- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.cpp
+++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.cpp
@@ -65,8 +65,8 @@ ClimateControlBackend::ClimateControlBackend(QObject *parent) :
     leftZone.seatHeater = 10;
     leftZone.seatHeaterAttribute = QIviPropertyAttribute<int>(0, 10);
     leftZone.targetTemperature = 20;
-    leftZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(0, 10);
-    m_zoneMap.insert("FrontLeft",leftZone);
+    leftZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(16, 28);
+    m_zoneMap.insert("FrontLeft", leftZone);
 
     ZoneBackend rightZone;
     rightZone.seatCooler = 5;
@@ -74,17 +74,17 @@ ClimateControlBackend::ClimateControlBackend(QObject *parent) :
     rightZone.seatHeater = 0;
     rightZone.seatHeaterAttribute = QIviPropertyAttribute<int>(0, 10);
     rightZone.targetTemperature = 20;
-    rightZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(0, 10);
-    m_zoneMap.insert("FrontRight",rightZone);
+    rightZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(16, 28);
+    m_zoneMap.insert("FrontRight", rightZone);
 
     ZoneBackend rearZone;
     rearZone.seatCooler = 0;
     rearZone.seatCoolerAttribute = QIviPropertyAttribute<int>();
     rearZone.seatHeater = 0;
     rearZone.seatHeaterAttribute = QIviPropertyAttribute<int>();
-    rearZone.targetTemperature = 10;
-    rearZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(0, 10);
-    m_zoneMap.insert("Rear",rearZone);
+    rearZone.targetTemperature = 20;
+    rearZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(16, 28);
+    m_zoneMap.insert("Rear", rearZone);
 }
 
 ClimateControlBackend::~ClimateControlBackend()
@@ -110,9 +110,9 @@ void ClimateControlBackend::initializeAttributes()
     emit zoneSynchronizationAttributeChanged(QIviPropertyAttribute<bool>(true));
     emit defrostEnabledChanged(m_defrost);
     emit defrostAttributeChanged(QIviPropertyAttribute<bool>(true));
-    emit steeringWheelHeaterAttributeChanged(QIviPropertyAttribute<int>(false));
+    emit steeringWheelHeaterAttributeChanged(QIviPropertyAttribute<int>(0, 10));
     emit steeringWheelHeaterChanged(m_steeringWheelHeater);
-    emit fanSpeedLevelAttributeChanged(QIviPropertyAttribute<int>(0, 10));
+    emit fanSpeedLevelAttributeChanged(QIviPropertyAttribute<int>(0, 6));
     emit fanSpeedLevelChanged(m_fanSpeed);
 
     QVector<QIviClimateControl::RecirculationMode> recirculation;
diff --git a/tests/auto/dlt/dlt.pro b/tests/auto/dlt/dlt.pro
index bbc2de0..feb04bc 100644
--- a/tests/auto/dlt/dlt.pro
+++ b/tests/auto/dlt/dlt.pro
@@ -3,8 +3,10 @@ QT       += testlib geniviextras
 TARGET = tst_dlt
 CONFIG   += testcase link_pkgconfig
 
+DLT_LIB_PATH = $$system($$pkgConfigExecutable() --variable=libdir automotive-dlt)
 !contains(QT_CONFIG, no-pkg-config) {
     PKGCONFIG += automotive-dlt
+    QMAKE_RPATH += $$DLT_LIB_PATH
 } else {
     LIBS += -ldlt
 }