X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2Fplugins%2Fprojectexplorer%2Fminiprojecttargetselector.h;h=f34848080b89a3f506009306cc8f262b135269eb;hb=48e425209a432d208a5a4d454f024af5332c8b83;hp=ee4e3b4500def34884271952d31b79aa517c33a3;hpb=113f8c3415501525604872b4140816cc46c918f2;p=qt-creator-jp%2Fqt-creator-jp.git

diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.h b/src/plugins/projectexplorer/miniprojecttargetselector.h
index ee4e3b4500..f34848080b 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.h
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.h
@@ -4,30 +4,29 @@
 **
 ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
 **
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
-** No Commercial Usage
-**
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
 **
 ** 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.
+** 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, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia 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.
+**
 ** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
+** Nokia at info@qt.nokia.com.
 **
 **************************************************************************/
 
@@ -65,9 +64,6 @@ public:
 
     QSize sizeHint() const;
 
-    void setBuildComboPopup();
-    void setRunComboPopup();
-
     ProjectExplorer::Project *project() const;
 
 private slots:
@@ -136,6 +132,7 @@ private slots:
     void mousePressEvent(QMouseEvent *);
 
 private:
+    QString fullName(ProjectExplorer::Project *project);
     int indexFor(ProjectExplorer::Project *project) const;
 
     QAction *m_projectAction;