Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42

src/plugins/coreplugin/actionmanager/commandbutton.cpp

@@ -1,32 +1,31 @@
 /****************************************************************************
 **
-** This file is part of Qt Creator
-**
 ** Copyright (c) 2012 Konstantin Tokarev.
+** Contact: http://www.qt-project.org/legal
 **
-** Contact: http://www.qt-project.org/
+** 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
-**
-** 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.
+** 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
+** rights.  These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
+****************************************************************************/
 
 #include "commandbutton.h"
 

src/plugins/coreplugin/actionmanager/commandbutton.h

@@ -1,32 +1,31 @@
 /****************************************************************************
 **
-** This file is part of Qt Creator
-**
 ** Copyright (c) 2012 Konstantin Tokarev.
+** Contact: http://www.qt-project.org/legal
 **
-** Contact: http://www.qt-project.org/
+** 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
-**
-** 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.
+** 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
+** rights.  These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
+****************************************************************************/
 
 #ifndef COMMANDBUTTON_H
 #define COMMANDBUTTON_H

src/plugins/coreplugin/core.qrc

@@ -13,8 +13,8 @@
         <file>images/filesave.png</file>
         <file>images/find.png</file>
         <file>images/findnext.png</file>
-        <file>images/logo/128/qtcreator.png</file>
-        <file>images/logo/32/qtcreator.png</file>
+        <file>images/logo/128/QtProject-qtcreator.png</file>
+        <file>images/logo/32/QtProject-qtcreator.png</file>
         <file>images/inputfield.png</file>
         <file>images/inputfield_disabled.png</file>
         <file>images/linkicon.png</file>

src/plugins/coreplugin/coreconstants.h

@@ -205,8 +205,8 @@ const char ICON_CLOSE_SPLIT_LEFT[]   = ":/core/images/splitbutton_closeleft.png"
 const char ICON_CLOSE_SPLIT_RIGHT[]  = ":/core/images/splitbutton_closeright.png";
 const char ICON_FILTER[]             = ":/core/images/filtericon.png";
 const char ICON_LINK[]               = ":/core/images/linkicon.png";
-const char ICON_QTLOGO_32[]          = ":/core/images/logo/32/qtcreator.png";
-const char ICON_QTLOGO_128[]         = ":/core/images/logo/128/qtcreator.png";
+const char ICON_QTLOGO_32[]          = ":/core/images/logo/32/QtProject-qtcreator.png";
+const char ICON_QTLOGO_128[]         = ":/core/images/logo/128/QtProject-qtcreator.png";
 
 const char WIZARD_CATEGORY_QT[] = "R.Qt";
 const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("Core", "Qt");

src/plugins/coreplugin/coreplugin.pro

@@ -236,7 +236,7 @@ else:unix {
     IMAGE_SIZE_LIST = 16 24 32 48 64 128 256 512
 
     for(imagesize, IMAGE_SIZE_LIST) {
-        eval(image$${imagesize}.files = images/logo/$${imagesize}/qtcreator.png)
+        eval(image$${imagesize}.files = images/logo/$${imagesize}/QtProject-qtcreator.png)
         eval(image$${imagesize}.path = $$QTC_PREFIX/share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
         INSTALLS += image$${imagesize}
     }

src/plugins/coreplugin/images/logo/logo.qbs

@@ -8,48 +8,48 @@ Product {
     Group {
         qbs.installDir: "share/icons/hicolor/16x16/apps"
         fileTags: ["install"]
-        files: ["16/qtcreator.png"]
+        files: ["16/QtProject-qtcreator.png"]
     }
 
     Group {
         qbs.installDir: "share/icons/hicolor/24x24/apps"
         fileTags: ["install"]
-        files: ["24/qtcreator.png"]
+        files: ["24/QtProject-qtcreator.png"]
     }
 
     Group {
         qbs.installDir: "share/icons/hicolor/32x32/apps"
         fileTags: ["install"]
-        files: ["32/qtcreator.png"]
+        files: ["32/QtProject-qtcreator.png"]
     }
 
     Group {
         qbs.installDir: "share/icons/hicolor/48x48/apps"
         fileTags: ["install"]
-        files: ["48/qtcreator.png"]
+        files: ["48/QtProject-qtcreator.png"]
     }
 
     Group {
         qbs.installDir: "share/icons/hicolor/64x64/apps"
         fileTags: ["install"]
-        files: ["64/qtcreator.png"]
+        files: ["64/QtProject-qtcreator.png"]
     }
 
     Group {
         qbs.installDir: "share/icons/hicolor/128x128/apps"
         fileTags: ["install"]
-        files: ["128/qtcreator.png"]
+        files: ["128/QtProject-qtcreator.png"]
     }
 
     Group {
         qbs.installDir: "share/icons/hicolor/256x256/apps"
         fileTags: ["install"]
-        files: ["256/qtcreator.png"]
+        files: ["256/QtProject-qtcreator.png"]
     }
 
     Group {
         qbs.installDir: "share/icons/hicolor/512x512/apps"
         fileTags: ["install"]
-        files: ["512/qtcreator.png"]
+        files: ["512/QtProject-qtcreator.png"]
     }
 }