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

Merge remote branch 'origin/1.3'

Browse Source 
Conflicts:
	src/libs/cplusplus/CheckUndefinedSymbols.cpp
	src/plugins/qmleditor/qmlcodecompletion.cpp
This commit is contained in:
Erik Verbruggen
2009-10-06 11:41:00 +02:00
parent c3e08337fc 06abe6b813
commit 49f6b740cd
318 changed files with 2873 additions and 1577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/qmlnewprojectwizard.cpp
View File

@@ -47,7 +47,7 @@
#include <QtGui/QTreeView>
using namespace QmlProjectManager::Internal;
using namespace Core::Utils;
using namespace Utils;
namespace {
@@ -124,7 +124,7 @@ QmlNewProjectWizardDialog::QmlNewProjectWizardDialog(QWidget *parent)
{
setWindowTitle(tr("New QML Project"));
m_introPage = new Core::Utils::ProjectIntroPage();
m_introPage = new Utils::ProjectIntroPage();
m_introPage->setDescription(tr("This wizard generates a QML application project."));
addPage(m_introPage);

5
src/plugins/qmlprojectmanager/qmlnewprojectwizard.h
View File

@@ -43,14 +43,13 @@ class QStringList;
class QTreeView;
QT_END_NAMESPACE
namespace Core {
namespace Utils {
class FileWizardPage;
class ProjectIntroPage;
} // namespace Utils
} // namespace Core
namespace QmlProjectManager {
namespace Internal {
@@ -79,7 +78,7 @@ protected:
private:
int m_secondPageId;
Core::Utils::ProjectIntroPage *m_introPage;
Utils::ProjectIntroPage *m_introPage;
QTreeView *m_dirView;
QDirModel *m_dirModel;

10
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -338,7 +338,7 @@ QmlRunConfiguration::QmlRunConfiguration(QmlProject *pro)
{
setName(tr("QML Viewer"));
m_qmlViewer = Core::Utils::SynchronousProcess::locateBinary(QLatin1String("qmlviewer"));
m_qmlViewer = Utils::SynchronousProcess::locateBinary(QLatin1String("qmlviewer"));
}
QmlRunConfiguration::~QmlRunConfiguration()
@@ -428,8 +428,8 @@ QWidget *QmlRunConfiguration::configurationWidget()
connect(combo, SIGNAL(activated(QString)), this, SLOT(setMainScript(QString)));
Core::Utils::PathChooser *qmlViewer = new Core::Utils::PathChooser;
qmlViewer->setExpectedKind(Core::Utils::PathChooser::Command);
Utils::PathChooser *qmlViewer = new Utils::PathChooser;
qmlViewer->setExpectedKind(Utils::PathChooser::Command);
qmlViewer->setPath(executable());
connect(qmlViewer, SIGNAL(changed(QString)), this, SLOT(onQmlViewerChanged()));
@@ -463,7 +463,7 @@ void QmlRunConfiguration::setMainScript(const QString &scriptFile)
void QmlRunConfiguration::onQmlViewerChanged()
{
if (Core::Utils::PathChooser *chooser = qobject_cast<Core::Utils::PathChooser *>(sender())) {
if (Utils::PathChooser *chooser = qobject_cast<Utils::PathChooser *>(sender())) {
m_qmlViewer = chooser->path();
}
}
@@ -492,7 +492,7 @@ void QmlRunConfiguration::restore(const ProjectExplorer::PersistentSettingsReade
m_scriptFile = reader.restoreValue(QLatin1String("mainscript")).toString();
if (m_qmlViewer.isEmpty())
m_qmlViewer = Core::Utils::SynchronousProcess::locateBinary(QLatin1String("qmlviewer"));
m_qmlViewer = Utils::SynchronousProcess::locateBinary(QLatin1String("qmlviewer"));
if (m_scriptFile.isEmpty())
m_scriptFile = tr("<Current File>");

2
src/plugins/qmlprojectmanager/qmlprojectwizard.cpp
View File

@@ -46,7 +46,7 @@
#include <QtGui/QTreeView>
using namespace QmlProjectManager::Internal;
using namespace Core::Utils;
using namespace Utils;
namespace {

6
src/plugins/qmlprojectmanager/qmlprojectwizard.h
View File

@@ -44,13 +44,9 @@ class QStringList;
class QTreeView;
QT_END_NAMESPACE
namespace Core {
namespace Utils {
class FileWizardPage;
} // namespace Utils
} // namespace Core
namespace QmlProjectManager {
namespace Internal {
@@ -79,7 +75,7 @@ protected:
private:
int m_secondPageId;
Core::Utils::FileWizardPage *m_firstPage;
Utils::FileWizardPage *m_firstPage;
QTreeView *m_dirView;
QDirModel *m_dirModel;