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

Change-Id: Ib3cd68bc73d1e4ba4231a00bdadaff41b2c15edb

8 files changed, 103 insertions, 12 deletions

diff --git a/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf b/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
index 980281b..f04200a 100644
--- a/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
+++ b/src/doc/qtautomotivesuite/qtautomotivesuite-project.qdocconf
@@ -1,6 +1,6 @@
 project                       = QtAutomotiveSuite
 description                   = Qt Automotive Suite Documentation
-version                       = 1.0.0
+version                       = 1.1.0
 url                           = http://doc.qt.io/QtAutomotiveSuite
 
 sourcedirs                   += src
@@ -9,14 +9,14 @@ imagedirs                    += src/images
 qhp.projects                  = QtAutomotiveSuite
 
 qhp.QtAutomotiveSuite.file                = qtautomotivesuite.qhp
-qhp.QtAutomotiveSuite.namespace           = org.qt-project.qtautomotivesuite.100
+qhp.QtAutomotiveSuite.namespace           = org.qt-project.qtautomotivesuite.$QT_VERSION_TAG
 qhp.QtAutomotiveSuite.virtualFolder       = qtautomotivesuite
 qhp.QtAutomotiveSuite.indexTitle          = Qt Automotive Suite
 qhp.QtAutomotiveSuite.indexRoot           =
 
-qhp.QtAutomotiveSuite.filterAttributes    = qtautomotivesuite 1.0.0 qtrefdoc
-qhp.QtAutomotiveSuite.customFilters.Qt.name = QtAutomotiveSuite 1.0.0
-qhp.QtAutomotiveSuite.customFilters.Qt.filterAttributes = qtautomotivesuite 1.0.0
+qhp.QtAutomotiveSuite.filterAttributes    = qtautomotivesuite $QT_VERSION qtrefdoc
+qhp.QtAutomotiveSuite.customFilters.Qt.name = QtAutomotiveSuite $QT_VERSION
+qhp.QtAutomotiveSuite.customFilters.Qt.filterAttributes = qtautomotivesuite $QT_VERSION
 
 qhp.QtAutomotiveSuite.subprojects                   = manual
 qhp.QtAutomotiveSuite.subprojects.manual.title      = Qt Automotive Suite
@@ -40,7 +40,7 @@ depends += \
      qtquick \
      neptuneui
 
-buildversion = "Qt Automotive Suite 1.0"
+buildversion = "Qt Automotive Suite 1.1"
 
 macro.QAS = "Qt Automotive Suite"
 navigation.homepage = "Qt Automotive Suite"
diff --git a/src/doc/qtautomotivesuite/src/external-resources.qdoc b/src/doc/qtautomotivesuite/src/external-resources.qdoc
index 5a44bc2..bcac20c 100644
--- a/src/doc/qtautomotivesuite/src/external-resources.qdoc
+++ b/src/doc/qtautomotivesuite/src/external-resources.qdoc
@@ -94,3 +94,23 @@
     \externalpage https://www.qt.io/download/
     \title Download Qt
 */
+
+/*!
+    \externalpage https://doc.qt.io/QtQmlLive/index.html
+    \title Qt QmlLive
+*/
+
+/*!
+    \externalpage https://doc.qt.io/NeptuneUI/index.html
+    \title Neptune UI
+*/
+
+/*!
+    \externalpage https://doc.qt.io/QtIVI/index.html
+    \title Qt IVI
+*/
+
+/*!
+    \externalpage https://doc.qt.io/QtGENIVIExtras/index.html
+    \title Qt GENIVI Extras
+*/
diff --git a/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc b/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
index 62bfabb..5a72f24 100644
--- a/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
+++ b/src/doc/qtautomotivesuite/src/qtautomotivesuite.qdoc
@@ -57,8 +57,10 @@
         \li \l {Qt GENIVI Extras}{Qt GENIVI Extras Module Reference Documentation}
         \li \l {Qt IVI}{Qt IVI Module Reference Documentation}
         \li \l {Qt Application Manager}
+        \li \l {Qt QmlLive}
         \li \l {Over-The-Air Update}
         \li \l {Qt Web Browser}
+        \li \l {Neptune UI}{Reference UI}
         \li \l {GammaRay}
     \endlist
 */
diff --git a/src/doc/qtgeniviextras/qtgeniviextras-project.qdocconf b/src/doc/qtgeniviextras/qtgeniviextras-project.qdocconf
index 78afc40..951537e 100644
--- a/src/doc/qtgeniviextras/qtgeniviextras-project.qdocconf
+++ b/src/doc/qtgeniviextras/qtgeniviextras-project.qdocconf
@@ -37,6 +37,8 @@ tagfile                 = qtgeniviextras.tags
 
 depends += qtcore qtdoc qtautomotivesuite
 
+indexes += ../../../doc/qtautomotivesuite/qtautomotivesuite.index
+
 navigation.homepage    = "Qt Automotive Suite"
 navigation.landingpage = "Qt GENIVI Extras"
 navigation.cppclassespage = "Qt GENIVI Extras C++ Classes"
diff --git a/src/doc/qtgeniviextras/src/external-resources.qdoc b/src/doc/qtgeniviextras/src/external-resources.qdoc
new file mode 100644
index 0000000..896fa13
--- /dev/null
+++ b/src/doc/qtgeniviextras/src/external-resources.qdoc
@@ -0,0 +1,36 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Automotive Suite.
+**
+** $QT_BEGIN_LICENSE:FDL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \externalpage http://www.genivi.org/
+    \title GENIVI
+*/
+
+/*!
+    \externalpage https://doc.qt.io/QtAutomotiveSuite/index.html
+    \title Qt Automotive Suite
+*/
diff --git a/src/doc/qtivi/src/external-resources.qdoc b/src/doc/qtivi/src/external-resources.qdoc
new file mode 100644
index 0000000..c48930b
--- /dev/null
+++ b/src/doc/qtivi/src/external-resources.qdoc
@@ -0,0 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Automotive Suite.
+**
+** $QT_BEGIN_LICENSE:FDL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \externalpage https://doc.qt.io/QtAutomotiveSuite/index.html
+    \title Qt Automotive Suite
+*/
diff --git a/src/ivicore/qiviabstractfeature.h b/src/ivicore/qiviabstractfeature.h
index 02e974b..1e42957 100644
--- a/src/ivicore/qiviabstractfeature.h
+++ b/src/ivicore/qiviabstractfeature.h
@@ -57,8 +57,8 @@ class Q_QTIVICORE_EXPORT QIviAbstractFeature : public QObject, public QQmlParser
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
 
-    Q_PROPERTY(DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged)
-    Q_PROPERTY(DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged)
+    Q_PROPERTY(QIviAbstractFeature::DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged)
+    Q_PROPERTY(QIviAbstractFeature::DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged)
     Q_PROPERTY(QIviServiceObject *serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged)
     Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged)
     Q_PROPERTY(bool isInitialized READ isInitialized NOTIFY isInitializedChanged)
diff --git a/src/ivicore/qivisearchandbrowsemodel.h b/src/ivicore/qivisearchandbrowsemodel.h
index dfbc486..ed901b6 100644
--- a/src/ivicore/qivisearchandbrowsemodel.h
+++ b/src/ivicore/qivisearchandbrowsemodel.h
@@ -54,7 +54,7 @@ class Q_QTIVICORE_EXPORT QIviSearchAndBrowseModel : public QIviAbstractFeatureLi
 {
     Q_OBJECT
 
-    Q_PROPERTY(Capabilities capabilities READ capabilities NOTIFY capabilitiesChanged)
+    Q_PROPERTY(QIviSearchAndBrowseModel::Capabilities capabilities READ capabilities NOTIFY capabilitiesChanged)
     Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged)
     Q_PROPERTY(QString contentType READ contentType WRITE setContentType NOTIFY contentTypeChanged)
     Q_PROPERTY(QStringList availableContentTypes READ availableContentTypes NOTIFY availableContentTypesChanged)
@@ -108,7 +108,7 @@ public:
     explicit QIviSearchAndBrowseModel(QObject *parent = nullptr);
     ~QIviSearchAndBrowseModel();
 
-    Capabilities capabilities() const;
+    QIviSearchAndBrowseModel::Capabilities capabilities() const;
 
     QString query() const;
     void setQuery(const QString &query);
@@ -140,7 +140,7 @@ public:
     Q_INVOKABLE QVariant get(int index) const;
     Q_INVOKABLE void goBack();
     Q_INVOKABLE bool canGoForward(int index) const;
-    Q_INVOKABLE QIviSearchAndBrowseModel *goForward(int index, NavigationType navigationType);
+    Q_INVOKABLE QIviSearchAndBrowseModel *goForward(int index, QIviSearchAndBrowseModel::NavigationType navigationType);
     Q_INVOKABLE void insert(int index, const QVariant &variant);
     Q_INVOKABLE void remove(int index);
     Q_INVOKABLE void move(int cur_index, int new_index);
@@ -152,7 +152,7 @@ public:
     }
 
 Q_SIGNALS:
-    void capabilitiesChanged(Capabilities capabilities);
+    void capabilitiesChanged(QIviSearchAndBrowseModel::Capabilities capabilities);
     void queryChanged(const QString &query);
     void chunkSizeChanged(int chunkSize);
     void countChanged();