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

Merge branch 'qml_renaming'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
This commit is contained in:
Thomas Hartmann
2010-03-01 09:44:00 +01:00
parent 20d21db2d0 c7f7585bda
commit 1f940786fb
117 changed files with 978 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -166,11 +166,11 @@ QWidget *QmlProjectRunConfiguration::configurationWidget()
Utils::PathChooser *qmlViewer = new Utils::PathChooser;
qmlViewer->setExpectedKind(Utils::PathChooser::Command);
qmlViewer->setPath(viewerPath());
connect(qmlViewer, SIGNAL(changed(QString)), this, SLOT(onQmlViewerChanged()));
connect(qmlViewer, SIGNAL(changed(QString)), this, SLOT(onViewerChanged()));
QLineEdit *qmlViewerArgs = new QLineEdit;
qmlViewerArgs->setText(m_qmlViewerArgs);
connect(qmlViewerArgs, SIGNAL(textChanged(QString)), this, SLOT(onQmlViewerArgsChanged()));
connect(qmlViewerArgs, SIGNAL(textChanged(QString)), this, SLOT(onViewerArgsChanged()));
QLineEdit *debugServer = new QLineEdit;
debugServer->setText(m_debugServerAddress);
@@ -214,14 +214,14 @@ void QmlProjectRunConfiguration::setMainScript(const QString &scriptFile)
m_scriptFile = scriptFile;
}
void QmlProjectRunConfiguration::onQmlViewerChanged()
void QmlProjectRunConfiguration::onViewerChanged()
{
if (Utils::PathChooser *chooser = qobject_cast<Utils::PathChooser *>(sender())) {
m_qmlViewerCustomPath = chooser->path();
}
}
void QmlProjectRunConfiguration::onQmlViewerArgsChanged()
void QmlProjectRunConfiguration::onViewerArgsChanged()
{
if (QLineEdit *lineEdit = qobject_cast<QLineEdit*>(sender()))
m_qmlViewerArgs = lineEdit->text();