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

QmlProjectManager: Fix compilation with latest changes of QDeclarative

Browse Source 
All files have been renamed from Qml to QDeclarative.
Registration of types is now done in an initializer method.
This commit is contained in:
Kai Koehne
2010-02-26 14:46:04 +01:00
parent 318fee6f5c
commit 4c59f3f2ce
15 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,11 +164,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);
@@ -212,14 +212,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();