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

Fix build.

Browse Source
This commit is contained in:
Bill King
2011-03-09 17:04:07 +01:00
parent 1e022e921d
commit 047cb50a6b
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp
View File

@@ -217,9 +217,9 @@ void MaemoMountAndInstallDeployStep::ctor()
m_installer = new MaemoDebianPackageInstaller(this); m_installer = new MaemoDebianPackageInstaller(this);
else else
m_installer = new MaemoRpmPackageInstaller(this); m_installer = new MaemoRpmPackageInstaller(this);
connect(m_installer, SIGNAL(stdout(QString)), connect(m_installer, SIGNAL(stdoutData(QString)),
SLOT(handleRemoteStdout(QString))); SLOT(handleRemoteStdout(QString)));
connect(m_installer, SIGNAL(stderr(QString)), connect(m_installer, SIGNAL(stderrData(QString)),
SLOT(handleRemoteStderr(QString))); SLOT(handleRemoteStderr(QString)));
connect(m_installer, SIGNAL(finished(QString)), connect(m_installer, SIGNAL(finished(QString)),
SLOT(handleInstallationFinished(QString))); SLOT(handleInstallationFinished(QString)));
@@ -293,9 +293,9 @@ void MaemoMountAndCopyDeployStep::ctor()
setDefaultDisplayName(DisplayName); setDefaultDisplayName(DisplayName);
m_copyFacility = new MaemoRemoteCopyFacility(this); m_copyFacility = new MaemoRemoteCopyFacility(this);
connect(m_copyFacility, SIGNAL(stdout(QString)), connect(m_copyFacility, SIGNAL(stdoutData(QString)),
SLOT(handleRemoteStdout(QString))); SLOT(handleRemoteStdout(QString)));
connect(m_copyFacility, SIGNAL(stderr(QString)), connect(m_copyFacility, SIGNAL(stderrData(QString)),
SLOT(handleRemoteStderr(QString))); SLOT(handleRemoteStderr(QString)));
connect(m_copyFacility, SIGNAL(progress(QString)), connect(m_copyFacility, SIGNAL(progress(QString)),
SLOT(handleProgressReport(QString))); SLOT(handleProgressReport(QString)));

2
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
View File

@@ -633,7 +633,7 @@ const QString MaemoRpmPackageCreationStep::CreatePackageId
class PROJECTEXPLORER_EXPORT CreateTarStepWidget : public BuildStepConfigWidget class CreateTarStepWidget : public BuildStepConfigWidget
{ {
Q_OBJECT Q_OBJECT
public: public:

6
src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp
View File

@@ -115,12 +115,12 @@ void AbstractMaemoPackageInstaller::handleInstallationFinished(int exitStatus)
void AbstractMaemoPackageInstaller::handleInstallerOutput(const QByteArray &output) void AbstractMaemoPackageInstaller::handleInstallerOutput(const QByteArray &output)
{ {
emit stdout(QString::fromUtf8(output)); emit stdoutData(QString::fromUtf8(output));
} }
void AbstractMaemoPackageInstaller::handleInstallerErrorOutput(const QByteArray &output) void AbstractMaemoPackageInstaller::handleInstallerErrorOutput(const QByteArray &output)
{ {
emit stderr(QString::fromUtf8(output)); emit stderrData(QString::fromUtf8(output));
} }
void AbstractMaemoPackageInstaller::setFinished() void AbstractMaemoPackageInstaller::setFinished()
@@ -134,7 +134,7 @@ void AbstractMaemoPackageInstaller::setFinished()
MaemoDebianPackageInstaller::MaemoDebianPackageInstaller(QObject *parent) MaemoDebianPackageInstaller::MaemoDebianPackageInstaller(QObject *parent)
: AbstractMaemoPackageInstaller(parent) : AbstractMaemoPackageInstaller(parent)
{ {
connect(this, SIGNAL(stderr(QString)), connect(this, SIGNAL(stderrData(QString)),
SLOT(handleInstallerErrorOutput(QString))); SLOT(handleInstallerErrorOutput(QString)));
} }

4
src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h
View File

@@ -57,8 +57,8 @@ public:
void cancelInstallation(); void cancelInstallation();
signals: signals:
void stdout(const QString &output); void stdoutData(const QString &output);
void stderr(const QString &output); void stderrData(const QString &output);
void finished(const QString &errorMsg = QString()); void finished(const QString &errorMsg = QString());
protected: protected:

5
src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.cpp
View File

@@ -33,6 +33,7 @@
#include "maemoremotecopyfacility.h" #include "maemoremotecopyfacility.h"
#include "maemoglobal.h" #include "maemoglobal.h"
#include <QtCore/QDir>
#include <utils/ssh/sshconnection.h> #include <utils/ssh/sshconnection.h>
#include <utils/ssh/sshremoteprocessrunner.h> #include <utils/ssh/sshremoteprocessrunner.h>
@@ -92,12 +93,12 @@ void MaemoRemoteCopyFacility::handleConnectionError()
void MaemoRemoteCopyFacility::handleRemoteStdout(const QByteArray &output) void MaemoRemoteCopyFacility::handleRemoteStdout(const QByteArray &output)
{ {
emit stdout(QString::fromUtf8(output)); emit stdoutData(QString::fromUtf8(output));
} }
void MaemoRemoteCopyFacility::handleRemoteStderr(const QByteArray &output) void MaemoRemoteCopyFacility::handleRemoteStderr(const QByteArray &output)
{ {
emit stderr(QString::fromUtf8(output)); emit stderrData(QString::fromUtf8(output));
} }
void MaemoRemoteCopyFacility::handleCopyFinished(int exitStatus) void MaemoRemoteCopyFacility::handleCopyFinished(int exitStatus)

4
src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.h
View File

@@ -60,8 +60,8 @@ public:
void cancel(); void cancel();
signals: signals:
void stdout(const QString &output); void stdoutData(const QString &output);
void stderr(const QString &output); void stderrData(const QString &output);
void progress(const QString &message); void progress(const QString &message);
void fileCopied(const MaemoDeployable &deployable); void fileCopied(const MaemoDeployable &deployable);
void finished(const QString &errorMsg = QString()); void finished(const QString &errorMsg = QString());

4
src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.cpp
View File

@@ -83,9 +83,9 @@ void MaemoUploadAndInstallDeployStep::ctor()
m_installer = new MaemoRpmPackageInstaller(this); m_installer = new MaemoRpmPackageInstaller(this);
else else
m_installer = new MaemoTarPackageInstaller(this); m_installer = new MaemoTarPackageInstaller(this);
connect(m_installer, SIGNAL(stdout(QString)), connect(m_installer, SIGNAL(stdoutData(QString)),
SLOT(handleRemoteStdout(QString))); SLOT(handleRemoteStdout(QString)));
connect(m_installer, SIGNAL(stderr(QString)), connect(m_installer, SIGNAL(stderrData(QString)),
SLOT(handleRemoteStderr(QString))); SLOT(handleRemoteStderr(QString)));
connect(m_installer, SIGNAL(finished(QString)), connect(m_installer, SIGNAL(finished(QString)),
SLOT(handleInstallationFinished(QString))); SLOT(handleInstallationFinished(QString)));