feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
hjk
2009-01-23 19:13:29 +01:00
parent 292d4bc3d5 3b930e1eda
commit 926fc06266
3 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp
View File

@@ -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 "cmakeconfigurewidget.h"
#include "cmakeprojectmanager.h" #include "cmakeprojectmanager.h"
#include <projectexplorer/environment.h> #include <projectexplorer/environment.h>

33
src/plugins/cmakeprojectmanager/cmakeconfigurewidget.h
View File

@@ -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 #ifndef CMAKECONFIGUREWIDGET_H
#define CMAKECONFIGUREWIDGET_H #define CMAKECONFIGUREWIDGET_H

3
src/plugins/projectexplorer/environment.cpp
View File

@@ -188,6 +188,9 @@ QString Environment::searchInPath(QString executable)
// qDebug()<<"looking for "<<executable<< "in PATH: "<<m_values.value("PATH"); // qDebug()<<"looking for "<<executable<< "in PATH: "<<m_values.value("PATH");
if (executable.isEmpty()) if (executable.isEmpty())
return QString::null; return QString::null;
QFileInfo fi(executable);
if (fi.isAbsolute() && fi.exists())
return executable;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (!executable.endsWith(QLatin1String(".exe"))) if (!executable.endsWith(QLatin1String(".exe")))
executable.append(QLatin1String(".exe")); executable.append(QLatin1String(".exe"));