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

Merge branch 'debugintegration'

Browse Source 
Conflicts:
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
This commit is contained in:
Lasse Holmstedt
2010-02-16 16:30:41 +01:00
parent 5262ca2061 580280af26
commit 4e5089d90d
28 changed files with 1275 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
View File

@@ -54,6 +54,7 @@ public:
QString viewerPath() const;
QStringList viewerArguments() const;
QString workingDirectory() const;
QString debugServerAddress() const;
uint debugServerPort() const;
// RunConfiguration
@@ -66,6 +67,7 @@ private slots:
void setMainScript(const QString &scriptFile);
void onQmlViewerChanged();
void onQmlViewerArgsChanged();
void onDebugServerAddressChanged();
void onDebugServerPortChanged();
protected:
@@ -79,6 +81,7 @@ private:
QString m_qmlViewerCustomPath;
QString m_qmlViewerDefaultPath;
QString m_qmlViewerArgs;
QString m_debugServerAddress;
uint m_debugServerPort;
};