Merge remote-tracking branch 'origin/3.1'

Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a

1 files changed, 0 insertions, 59 deletions

diff --git a/src/plugins/welcome/communitywelcomepage.h b/src/plugins/welcome/communitywelcomepage.h
deleted file mode 100644
index 89585564d8..0000000000
--- a/src/plugins/welcome/communitywelcomepage.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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 Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef COMMUNITYWELCOMEPAGE_H
-#define COMMUNITYWELCOMEPAGE_H
-
-#include <utils/iwelcomepage.h>
-#include <coreplugin/icore.h>
-
-namespace Welcome {
-namespace Internal {
-
-class CommunityWelcomePageWidget;
-
-class CommunityWelcomePage : public Utils::IWelcomePage
-{
-    Q_OBJECT
-public:
-    CommunityWelcomePage();
-
-    QString pageLocation() const { return Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/newssupport.qml"); }
-    QWidget *page();
-    QString title() const { return tr("News && Support"); }
-    int priority() const { return 30; }
-
-private:
-    CommunityWelcomePageWidget *m_page;
-};
-
-} // namespace Internal
-} // namespace Welcome
-
-#endif // COMMUNITYWELCOMEPAGE_H