From d66d188f51d93a2eb3197f67fb6551912f7628c3 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 21 May 2010 16:24:38 +0200
Subject: [PATCH] Build fix.
Reviewed-by: kh
---
.../qt4projectmanager/qt-maemo/maemorunconfiguration.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
index 5542989afb3..b839c411a00 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
@@ -88,11 +88,6 @@ 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;
@@ -113,10 +108,6 @@ 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,
--
GitLab