diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-24 17:45:21 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-24 17:45:21 +0200 |
| commit | 8e6569663ecbf7389b3df5d86f4ce2d1102b16c0 (patch) | |
| tree | 290fe9c4af570126949093affc25c7a9fb84e8ed /src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.h | |
| parent | 1cbc4116d3c6fa1320ee4523e45a5f0df004cd3a (diff) | |
| parent | e5076cc5e50be46b2f2a2307660e5e8603b780ad (diff) | |
| download | qt-creator-8e6569663ecbf7389b3df5d86f4ce2d1102b16c0.tar.gz | |
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline into 2.0
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.h')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.h b/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.h index 3af6d60e25..f395a867a5 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.h +++ b/src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.h @@ -110,6 +110,7 @@ private slots: void qemuProcessFinished(); void qemuProcessError(QProcess::ProcessError error); void qemuStatusChanged(QemuStatus status, const QString &error); + void qemuOutput(); private: void setupRuntimes(); @@ -117,7 +118,8 @@ private: void updateStarterIcon(bool running); void toggleStarterButton(ProjectExplorer::Target *target); - bool targetUsesRuntimeConfig(ProjectExplorer::Target *target); + bool targetUsesMatchingRuntimeConfig(ProjectExplorer::Target *target, + QtVersion **qtVersion = 0); QString maddeRoot(const QString &qmake) const; QString targetRoot(const QString &qmake) const; |