Merge 2.0 into master

Change-Id: Iba50a151f8e5f74d6f58dbe5ae6c596fe72d13f5

6 files changed, 11 insertions, 23 deletions

diff --git a/changelogs/changes-2.0.0.md b/changelogs/changes-2.0.0.md
index 93a37ae7f..14cacb761 100644
--- a/changelogs/changes-2.0.0.md
+++ b/changelogs/changes-2.0.0.md
@@ -9,6 +9,9 @@
 # BareMetal support
 * Added support for HPPA architectures
 
+# Other modules
+* Renamed "name" to "appName" in the freedesktop module to prevent clash with built-in property
+
 # Infrastructure
 * Added USBSAN CI job
 
diff --git a/cmake/QbsDocumentation.cmake b/cmake/QbsDocumentation.cmake
index c8c1635e7..bdcec664f 100644
--- a/cmake/QbsDocumentation.cmake
+++ b/cmake/QbsDocumentation.cmake
@@ -40,23 +40,6 @@ function(qt_query_qmake)
     endforeach()
 endfunction()
 
-# Find programs:
-function(_qbs_doc_find_program result_var)
-    if (NOT TARGET Qt${QT_VERSION_MAJOR}::qmake)
-        message(FATAL_ERROR "QDoc is only available in Qt projects")
-    endif()
-
-    get_target_property(_qmake_binary Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
-    get_filename_component(_qmake_dir "${_qmake_binary}" DIRECTORY)
-    find_program("_prg_${result_var}" ${ARGN} HINTS "${_qmake_dir}")
-    if ("_prg_${result_var}" STREQUAL "_prg_${result_var}-NOTFOUND")
-        set("_prg_${result_var}" "${result_var}-NOTFOUND")
-        message(WARNING "Could not find binary for ${result_var}")
-    endif()
-
-    set(${result_var} "${_prg_${result_var}}" PARENT_SCOPE)
-endfunction()
-
 function(_qbs_setup_doc_targets)
     # Set up important targets:
     if (NOT TARGET qbs_html_docs)
@@ -114,6 +97,8 @@ function(_qbs_setup_qdoc_targets _qdocconf_file _retval)
         list(APPEND _env "${_export}=${${_export}}")
     endforeach()
 
+    get_target_property(_qdoc Qt${QT_VERSION_MAJOR}::qdoc IMPORTED_LOCATION)
+
     set(_full_qdoc_command "${_qdoc}")
     if (_env)
         set(_full_qdoc_command "${CMAKE_COMMAND}" "-E" "env" ${_env} "${_qdoc}")
@@ -246,8 +231,7 @@ endfunction()
 function(_qbs_qdoc_build_qdocconf_file _qdocconf_file)
     _qbs_setup_doc_targets()
 
-    _qbs_doc_find_program(_qdoc NAMES qdoc qdoc-qt5)
-    if (_qdoc STREQUAL "_prg__qdoc-NOTFOUND")
+    if (NOT TARGET Qt${QT_VERSION_MAJOR}::qdoc)
         message(WARNING "No qdoc binary found: No documentation targets were generated")
         return()
     endif()
diff --git a/doc/reference/modules/freedesktop-module.qdoc b/doc/reference/modules/freedesktop-module.qdoc
index 6c9d4a7fa..5b6b14d0f 100644
--- a/doc/reference/modules/freedesktop-module.qdoc
+++ b/doc/reference/modules/freedesktop-module.qdoc
@@ -119,7 +119,7 @@
 */
 
 /*!
-    \qmlproperty string freedesktop::name
+    \qmlproperty string freedesktop::appName
 
     The display name of the application which will be stored in the \c{.desktop} file.
 
diff --git a/share/qbs/modules/freedesktop/FreeDesktop.qbs b/share/qbs/modules/freedesktop/FreeDesktop.qbs
index 5fe7ed72c..60722c674 100644
--- a/share/qbs/modules/freedesktop/FreeDesktop.qbs
+++ b/share/qbs/modules/freedesktop/FreeDesktop.qbs
@@ -34,13 +34,14 @@ import "freedesktop.js" as Fdo
 
 Module {
     property string name: product.name
+    property string appName: name
 
     property var desktopKeys
 
     readonly property var defaultDesktopKeys: {
         return {
             'Type': 'Application',
-            'Name': product.freedesktop.name,
+            'Name': product.freedesktop.appName,
             'Exec': product.targetName,
             'Terminal': 'false',
             'Version': '1.1',
diff --git a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs
index b3519ba4c..1efe5c91c 100644
--- a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs
+++ b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs
@@ -10,7 +10,7 @@ Project {
 
         Depends { name: "freedesktop" }
 
-        freedesktop.name: "My App"
+        freedesktop.appName: "My App"
         freedesktop.desktopKeys: ({
             'Icon': "myapp.png"
         })
diff --git a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs
index 6f5360ccb..a7debfa07 100644
--- a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs
+++ b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs
@@ -11,7 +11,7 @@ CppApplication {
     }
 
     Depends { name: "cpp" }
-    cpp.cxxLanguageVersion: "c++11"
+    cpp.cxxLanguageVersion: "c++14"
     cpp.minimumMacosVersion: "10.8"
     cpp.warningLevel: "none"