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

6
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -236,7 +236,7 @@ ShadowBuildPage::ShadowBuildPage(CMakeOpenProjectWizard *cmakeWizard, bool chang
"This ensures that the source directory remains clean and enables multiple builds "
"with different settings."));
fl->addWidget(label);
m_pc = new Core::Utils::PathChooser(this);
m_pc = new Utils::PathChooser(this);
m_pc->setPath(m_cmakeWizard->buildDirectory());
connect(m_pc, SIGNAL(changed(QString)), this, SLOT(buildDirectoryChanged()));
fl->addRow(tr("Build directory:"), m_pc);
@@ -284,8 +284,8 @@ void CMakeRunPage::initWidgets()
fl->addRow(new QLabel(text, this));
// Show a field for the user to enter
m_cmakeExecutable = new Core::Utils::PathChooser(this);
m_cmakeExecutable->setExpectedKind(Core::Utils::PathChooser::Command);
m_cmakeExecutable = new Utils::PathChooser(this);
m_cmakeExecutable->setExpectedKind(Utils::PathChooser::Command);
fl->addRow("CMake Executable", m_cmakeExecutable);
}

10
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
View File

@@ -40,10 +40,8 @@
#include <QtGui/QWizard>
#include <QtGui/QPlainTextEdit>
namespace Core {
namespace Utils {
class PathChooser;
}
namespace Utils {
class PathChooser;
}
namespace CMakeProjectManager {
@@ -115,7 +113,7 @@ private slots:
void buildDirectoryChanged();
private:
CMakeOpenProjectWizard *m_cmakeWizard;
Core::Utils::PathChooser *m_pc;
Utils::PathChooser *m_pc;
};
class CMakeRunPage : public QWizardPage
@@ -139,7 +137,7 @@ private:
QPushButton *m_runCMake;
QProcess *m_cmakeProcess;
QLineEdit *m_argumentsLineEdit;
Core::Utils::PathChooser *m_cmakeExecutable;
Utils::PathChooser *m_cmakeExecutable;
QComboBox *m_generatorComboBox;
QLabel *m_descriptionLabel;
bool m_complete;

4
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -262,8 +262,8 @@ QWidget *CMakeSettingsPage::createPage(QWidget *parent)
{
QWidget *w = new QWidget(parent);
QFormLayout *fl = new QFormLayout(w);
m_pathchooser = new Core::Utils::PathChooser(w);
m_pathchooser->setExpectedKind(Core::Utils::PathChooser::Command);
m_pathchooser = new Utils::PathChooser(w);
m_pathchooser->setExpectedKind(Utils::PathChooser::Command);
fl->addRow(tr("CMake executable"), m_pathchooser);
m_pathchooser->setPath(cmakeExecutable());
return w;

2
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
View File

@@ -107,7 +107,7 @@ private:
QString findCmakeExecutable() const;
void updateInfo();
Core::Utils::PathChooser *m_pathchooser;
Utils::PathChooser *m_pathchooser;
QString m_cmakeExecutable;
enum STATE { VALID, INVALID, RUNNING } m_state;
QProcess *m_process;

4
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -246,9 +246,9 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
this, SLOT(setArguments(QString)));
fl->addRow(tr("Arguments:"), argumentsLineEdit);
m_workingDirectoryEdit = new Core::Utils::PathChooser();
m_workingDirectoryEdit = new Utils::PathChooser();
m_workingDirectoryEdit->setPath(m_cmakeRunConfiguration->workingDirectory());
m_workingDirectoryEdit->setExpectedKind(Core::Utils::PathChooser::Directory);
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
m_workingDirectoryEdit->setPromptDialogTitle(tr("Select the working directory"));
QToolButton *resetButton = new QToolButton();

2
src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
View File

@@ -120,7 +120,7 @@ private:
void updateSummary();
bool m_ignoreChange;
CMakeRunConfiguration *m_cmakeRunConfiguration;
Core::Utils::PathChooser *m_workingDirectoryEdit;
Utils::PathChooser *m_workingDirectoryEdit;
QComboBox *m_baseEnvironmentComboBox;
ProjectExplorer::EnvironmentWidget *m_environmentWidget;
Utils::DetailsWidget *m_detailsContainer;