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

DebuggingHelper: Move to QtSupport

Browse Source 
* Move debugginghelper to QtSupport. ProjectExplorer should not start
  looking for Qt versions!
* Make autotools and generic project plugins depend on QtSupport

Change-Id: If28418a85e3696cba713e66148c893a5a9b6adc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-05-16 16:24:16 +02:00
parent 5c23c44ed0
commit 5a79945ef6
47 changed files with 159 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidtarget.cpp
View File

@@ -38,12 +38,12 @@
#include "androidglobal.h"
#include "androidpackagecreationstep.h"
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <qt4projectmanager/qt4nodes.h>
#include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qt4projectmanager/qt4target.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <QDir>
#include <QFileSystemWatcher>
@@ -120,7 +120,7 @@ void AndroidTarget::createApplicationProFiles(bool reparse)
// Oh still none? Add a custom executable runconfiguration
if (runConfigurations().isEmpty()) {
addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(this));
addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(this));
}
}

4
src/plugins/android/androidtargetfactory.cpp
View File

@@ -42,8 +42,8 @@
#include <projectexplorer/deployconfiguration.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <qt4projectmanager/buildconfigurationinfo.h>
#include <qtsupport/customexecutablerunconfiguration.h>
#include <qtsupport/qtversionmanager.h>
@@ -173,7 +173,7 @@ Qt4BaseTarget *AndroidTargetFactory::create(ProjectExplorer::Project *parent, co
target->createApplicationProFiles(false);
if (target->runConfigurations().isEmpty())
target->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(target));
target->addRunConfiguration(new QtSupport::CustomExecutableRunConfiguration(target));
return target;
}