diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-03-08 07:48:55 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-03-08 07:48:55 +0100 |
| commit | 4b8df15f3d904f39e78b975fb3bedba03dcce9c1 (patch) | |
| tree | ca71b9f2ed39590a6b0fd28305cad9c9544e2d36 /src/plugins/genericprojectmanager | |
| parent | 3a808b0fd8a2e9d89ff01f51ffa6014f8207979d (diff) | |
| parent | 62fd2713d00ed3756cead7072cbbd61e631e6670 (diff) | |
| download | qt-creator-4b8df15f3d904f39e78b975fb3bedba03dcce9c1.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
src/plugins/remotelinux/startgdbserverdialog.cpp
Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
Diffstat (limited to 'src/plugins/genericprojectmanager')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericprojectplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp index d7da6323b1..95bfb05043 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp +++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp @@ -105,8 +105,8 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage connect(m_editFilesAction, SIGNAL(triggered()), this, SLOT(editFiles())); connect(ProjectExplorer::ProjectExplorerPlugin::instance(), - SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)), - this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*))); + SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*)), + this, SLOT(updateContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*))); return true; } |