From a087b138f5c8328b56e977a40e1a6ab106c772f8 Mon Sep 17 00:00:00 2001
From: dt <qtc-commiter@nokia.com>
Date: Fri, 23 Jan 2009 18:53:16 +0100
Subject: [PATCH 1/2] Fixes:    Make searchInPath() more robust.

Details:  returns the argument if it is absolute and already exists.
---
 src/plugins/projectexplorer/environment.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/projectexplorer/environment.cpp b/src/plugins/projectexplorer/environment.cpp
index 38f35af9727..cfc9c2213d2 100644
--- a/src/plugins/projectexplorer/environment.cpp
+++ b/src/plugins/projectexplorer/environment.cpp
@@ -188,6 +188,9 @@ QString Environment::searchInPath(QString executable)
 //    qDebug()<<"looking for "<<executable<< "in PATH: "<<m_values.value("PATH");
     if (executable.isEmpty())
         return QString::null;
+    QFileInfo fi(executable);
+    if (fi.isAbsolute() && fi.exists())
+        return executable;
 #ifdef Q_OS_WIN
     if (!executable.endsWith(QLatin1String(".exe")))
         executable.append(QLatin1String(".exe"));

From 3b930e1eda518bbeb620dc476cb891e3fa13ebe5 Mon Sep 17 00:00:00 2001
From: dt <qtc-commiter@nokia.com>
Date: Fri, 23 Jan 2009 18:54:46 +0100
Subject: [PATCH 2/2] Fixes:    Add copyright header to
 cmakeconfigurationwidget.h and cpp

---
 .../cmakeconfigurewidget.cpp                  | 33 +++++++++++++++++++
 .../cmakeconfigurewidget.h                    | 33 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp b/src/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp
index 41b6a7e0db5..c0065c4fc15 100644
--- a/src/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp
@@ -1,3 +1,36 @@
+/***************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact:  Qt Software Information (qt-info@nokia.com)
+**
+**
+** Non-Open Source Usage
+**
+** Licensees may use this file in accordance with the Qt Beta Version
+** License Agreement, Agreement version 2.2 provided with the Software or,
+** alternatively, in accordance with the terms contained in a written
+** agreement between you and Nokia.
+**
+** GNU General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the packaging
+** of this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+**
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt GPL Exception
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
+**
+***************************************************************************/
+
 #include "cmakeconfigurewidget.h"
 #include "cmakeprojectmanager.h"
 #include <projectexplorer/environment.h>
diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigurewidget.h b/src/plugins/cmakeprojectmanager/cmakeconfigurewidget.h
index f44444537bf..5565f8f17bc 100644
--- a/src/plugins/cmakeprojectmanager/cmakeconfigurewidget.h
+++ b/src/plugins/cmakeprojectmanager/cmakeconfigurewidget.h
@@ -1,3 +1,36 @@
+/***************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact:  Qt Software Information (qt-info@nokia.com)
+**
+**
+** Non-Open Source Usage
+**
+** Licensees may use this file in accordance with the Qt Beta Version
+** License Agreement, Agreement version 2.2 provided with the Software or,
+** alternatively, in accordance with the terms contained in a written
+** agreement between you and Nokia.
+**
+** GNU General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the packaging
+** of this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+**
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt GPL Exception
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
+**
+***************************************************************************/
+
 #ifndef CMAKECONFIGUREWIDGET_H
 #define CMAKECONFIGUREWIDGET_H