Merge remote-tracking branch 'origin/11.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I0b0394dd68cf89b2579d623af897f55dc01aeea5

cmake/Findyaml-cpp.cmake

@@ -15,7 +15,15 @@ if (yaml-cpp_FOUND)
     unset(yaml_cpp_include_dir CACHE)
     find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
   endif()
-  set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
+  if(TARGET yaml-cpp::yaml-cpp)
+    # yaml-cpp >= 0.8
+    set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE)
+    add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
+    set(yaml-cpp_TARGET yaml-cpp::yaml-cpp)
+  else()
+    set(yaml-cpp_TARGET yaml-cpp)
+  endif()
+  set_target_properties(${yaml-cpp_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
 else()
   if(TARGET yaml-cpp)
     return()

dist/installer/mac/qtcreator_process_stub.entitlements

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <!-- Allow debugging with terminal -->
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.get-task-allow</key>
+    <true/>
+</dict>
+</plist>

src/plugins/cmakeprojectmanager/fileapidataextractor.cpp

@@ -180,10 +180,10 @@ QVector<FolderNode::LocationInfo> extractBacktraceInformation(const BacktraceInf
     return info;
 }
 
-static bool isChildOf(const FilePath &path, const QStringList &prefixes)
+static bool isChildOf(const FilePath &path, const FilePaths &prefixes)
 {
-    for (const QString &prefix : prefixes)
+    for (const FilePath &prefix : prefixes)
-        if (path.isChildOf(FilePath::fromString(prefix)))
+        if (path == prefix || path.isChildOf(prefix))
             return true;
     return false;
 }

src/plugins/cmakeprojectmanager/fileapiparser.cpp

@@ -35,7 +35,7 @@ const QStringList CMAKE_QUERY_FILENAMES = {"cache-v2", "codemodel-v2", "cmakeFil
 // Helper:
 // --------------------------------------------------------------------
 
-static FilePath cmakeReplyDirectory(const FilePath &buildDirectory)
+FilePath FileApiParser::cmakeReplyDirectory(const FilePath &buildDirectory)
 {
     return buildDirectory.pathAppended(CMAKE_RELATIVE_REPLY_PATH);
 }
@@ -794,7 +794,7 @@ FilePath FileApiDetails::ReplyFileContents::jsonFile(const QString &kind, const
 // FileApi:
 // --------------------------------------------------------------------
 
-bool FileApiParser::setupCMakeFileApi(const FilePath &buildDirectory, Utils::FileSystemWatcher &watcher)
+bool FileApiParser::setupCMakeFileApi(const FilePath &buildDirectory)
 {
     // So that we have a directory to watch.
     buildDirectory.pathAppended(CMAKE_RELATIVE_REPLY_PATH).ensureWritableDir();
@@ -817,7 +817,6 @@ bool FileApiParser::setupCMakeFileApi(const FilePath &buildDirectory, Utils::Fil
         }
     }
 
-    watcher.addDirectory(cmakeReplyDirectory(buildDirectory).path(), FileSystemWatcher::WatchAllChanges);
     return true;
 }
 

src/plugins/cmakeprojectmanager/fileapiparser.h

@@ -227,9 +227,9 @@ public:
                                  const QString &cmakeBuildType,
                                  QString &errorMessage);
 
-    static bool setupCMakeFileApi(const Utils::FilePath &buildDirectory,
+    static bool setupCMakeFileApi(const Utils::FilePath &buildDirectory);
-                                  Utils::FileSystemWatcher &watcher);
 
+    static Utils::FilePath cmakeReplyDirectory(const Utils::FilePath &buildDirectory);
     static Utils::FilePaths cmakeQueryFilePaths(const Utils::FilePath &buildDirectory);
 
     static Utils::FilePath scanForCMakeReplyFile(const Utils::FilePath &buildDirectory);

src/plugins/cmakeprojectmanager/fileapireader.cpp

@@ -60,7 +60,7 @@ void FileApiReader::setParameters(const BuildDirParameters &p)
     // Reset watcher:
     m_watcher.clear();
 
-    FileApiParser::setupCMakeFileApi(m_parameters.buildDirectory, m_watcher);
+    FileApiParser::setupCMakeFileApi(m_parameters.buildDirectory);
 
     resetData();
 }
@@ -378,7 +378,10 @@ void FileApiReader::cmakeFinishedState(int exitCode)
     if (m_lastCMakeExitCode != 0)
         makeBackupConfiguration(false);
 
-    FileApiParser::setupCMakeFileApi(m_parameters.buildDirectory, m_watcher);
+    FileApiParser::setupCMakeFileApi(m_parameters.buildDirectory);
+
+    m_watcher.addDirectory(FileApiParser::cmakeReplyDirectory(m_parameters.buildDirectory).path(),
+                           FileSystemWatcher::WatchAllChanges);
 
     endState(FileApiParser::scanForCMakeReplyFile(m_parameters.buildDirectory),
              m_lastCMakeExitCode != 0);

src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp

@@ -321,6 +321,8 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
     m_timeoutSpinBox->setValue(sshParams.timeout);
     m_userLineEdit->setText(sshParams.userName());
     m_keyFileLineEdit->setFilePath(sshParams.privateKeyFile);
+    m_keyFileLineEdit->setEnabled(
+        sshParams.authenticationType == SshParameters::AuthenticationTypeSpecificKey);
     m_gdbServerLineEdit->setFilePath(device()->debugServerPath());
     m_qmlRuntimeLineEdit->setFilePath(device()->qmlRunCommand());