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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
This commit is contained in:
Eike Ziller
2012-10-16 17:42:10 +02:00
parent 07565f155f 1982a3b5a5
commit 70b5e1f64d
79 changed files with 9036 additions and 1899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
View File

@@ -50,6 +50,7 @@ namespace Utils {
namespace QtSupport { class BaseQtVersion; }
namespace QmlProjectManager {
class QmlProject;
namespace Internal {
class QmlProjectRunConfigurationFactory;
@@ -61,6 +62,7 @@ class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplor
Q_OBJECT
friend class Internal::QmlProjectRunConfigurationFactory;
friend class Internal::QmlProjectRunConfigurationWidget;
friend class QmlProject; // to call updateEnabled()
public:
QmlProjectRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
@@ -93,10 +95,8 @@ public:
ProjectExplorer::Abi abi() const;
public slots:
void changeCurrentFile(Core::IEditor*);
private slots:
void changeCurrentFile(Core::IEditor*);
void updateEnabled();
protected: