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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
This commit is contained in:
con
2010-05-21 16:04:27 +02:00
parent ec6fc83c5d e9d1841552
commit e327467a03
32 changed files with 422 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
View File

@@ -88,6 +88,11 @@ public:
MaemoDeviceConfig deviceConfig() const;
QString runtimeGdbServerPort() const;
<<<<<<< HEAD
=======
const QString sshCmd() const;
const QString scpCmd() const;
>>>>>>> origin/2.0
const QString gdbCmd() const;
const QString dumperLib() const;
@@ -108,6 +113,10 @@ private slots:
private:
void init();
<<<<<<< HEAD
=======
const QString cmd(const QString &cmdName) const;
>>>>>>> origin/2.0
const MaemoToolChain *toolchain() const;
bool fileNeedsDeployment(const QString &path, const QDateTime &lastDeployed) const;
void addDeployTimesToMap(const QString &key,