Merge remote-tracking branch 'origin/4.9'

 Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6

1 files changed, 49 insertions, 0 deletions

diff --git a/tests/unit/unittest/mockprojectpartsmanager.h b/tests/unit/unittest/mockprojectpartsmanager.h
new file mode 100644
index 0000000000..b2cab59060
--- /dev/null
+++ b/tests/unit/unittest/mockprojectpartsmanager.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt 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 General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include "googletest.h"
+
+#include <projectpartsmanagerinterface.h>
+
+class MockProjectPartsManager : public ClangBackEnd::ProjectPartsManagerInterface
+{
+public:
+    MOCK_METHOD1(update,
+                 ClangBackEnd::ProjectPartContainers(
+                     const ClangBackEnd::ProjectPartContainers &projectsParts));
+    MOCK_METHOD1(remove, void(const ClangBackEnd::ProjectPartIds &projectPartIds));
+    MOCK_CONST_METHOD1(
+        projects,
+        ClangBackEnd::ProjectPartContainers(const ClangBackEnd::ProjectPartIds &projectPartIds));
+    MOCK_METHOD1(updateDeferred, void(const ClangBackEnd::ProjectPartContainers &projectsParts));
+    MOCK_METHOD0(deferredUpdates, ClangBackEnd::ProjectPartContainers());
+
+    ClangBackEnd::ProjectPartContainers update(ClangBackEnd::ProjectPartContainers &&projectsParts) override
+    {
+        return update(projectsParts);
+    }
+};