Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
16fcb82d
Commit
16fcb82d
authored
Nov 30, 2009
by
dt
Browse files
Fix signal names and also ensure that we don't reset the cursor position
parent
527a9bd5
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qmakestep.cpp
View file @
16fcb82d
...
...
@@ -216,10 +216,10 @@ bool QMakeStep::processFinished(int exitCode, QProcess::ExitStatus status)
return
result
;
}
void
QMakeStep
::
set
QMake
Arguments
(
const
QStringList
&
arguments
)
void
QMakeStep
::
set
User
Arguments
(
const
QStringList
&
arguments
)
{
m_userArgs
=
arguments
;
emit
c
hanged
();
emit
userArgumentsC
hanged
();
}
QStringList
QMakeStep
::
userArguments
()
...
...
@@ -240,14 +240,14 @@ void QMakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
}
QMakeStepConfigWidget
::
QMakeStepConfigWidget
(
QMakeStep
*
step
)
:
BuildStepConfigWidget
(),
m_step
(
step
)
:
BuildStepConfigWidget
(),
m_step
(
step
)
,
m_ignoreChange
(
false
)
{
m_ui
.
setupUi
(
this
);
connect
(
m_ui
.
qmakeAdditonalArgumentsLineEdit
,
SIGNAL
(
textEdited
(
const
QString
&
)),
this
,
SLOT
(
qmakeArgumentsLineEditTextEdited
()));
connect
(
m_ui
.
buildConfigurationComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
buildConfigurationChanged
()));
connect
(
step
,
SIGNAL
(
c
hanged
()),
this
,
SLOT
(
u
pdate
()));
connect
(
step
,
SIGNAL
(
userArgumentsC
hanged
()),
this
,
SLOT
(
u
serArgumentsChanged
()));
connect
(
step
->
buildConfiguration
(),
SIGNAL
(
qtVersionChanged
()),
this
,
SLOT
(
qtVersionChanged
()));
}
...
...
@@ -289,8 +289,10 @@ void QMakeStepConfigWidget::updateTitleLabel()
void
QMakeStepConfigWidget
::
qmakeArgumentsLineEditTextEdited
()
{
m_step
->
setQMakeArguments
(
m_ignoreChange
=
true
;
m_step
->
setUserArguments
(
ProjectExplorer
::
Environment
::
parseCombinedArgString
(
m_ui
.
qmakeAdditonalArgumentsLineEdit
->
text
()));
m_ignoreChange
=
false
;
m_step
->
qt4BuildConfiguration
()
->
qt4Project
()
->
invalidateCachedTargetInformation
();
updateTitleLabel
();
...
...
@@ -321,9 +323,12 @@ QString QMakeStepConfigWidget::displayName() const
return
m_step
->
displayName
();
}
void
QMakeStepConfigWidget
::
u
pdate
()
void
QMakeStepConfigWidget
::
u
serArgumentsChanged
()
{
init
();
if
(
m_ignoreChange
)
return
;
QString
qmakeArgs
=
ProjectExplorer
::
Environment
::
joinArgumentList
(
m_step
->
userArguments
());
m_ui
.
qmakeAdditonalArgumentsLineEdit
->
setText
(
qmakeArgs
);
}
void
QMakeStepConfigWidget
::
init
()
...
...
src/plugins/qt4projectmanager/qmakestep.h
View file @
16fcb82d
...
...
@@ -83,13 +83,13 @@ public:
QStringList
allArguments
();
QStringList
userArguments
();
void
set
QMake
Arguments
(
const
QStringList
&
arguments
);
void
set
User
Arguments
(
const
QStringList
&
arguments
);
virtual
void
restoreFromLocalMap
(
const
QMap
<
QString
,
QVariant
>
&
map
);
virtual
void
storeIntoLocalMap
(
QMap
<
QString
,
QVariant
>
&
map
);
signals:
void
c
hanged
();
void
userArgumentsC
hanged
();
protected:
virtual
void
processStartupFailed
();
...
...
@@ -115,7 +115,7 @@ public:
private
slots
:
void
qmakeArgumentsLineEditTextEdited
();
void
buildConfigurationChanged
();
void
u
pdate
();
void
u
serArgumentsChanged
();
void
qtVersionChanged
();
private:
void
updateTitleLabel
();
...
...
@@ -123,6 +123,7 @@ private:
Ui
::
QMakeStep
m_ui
;
QMakeStep
*
m_step
;
QString
m_summaryText
;
bool
m_ignoreChange
;
};
}
// namespace Qt4ProjectManager
...
...
src/plugins/qt4projectmanager/qt4project.cpp
View file @
16fcb82d
...
...
@@ -476,7 +476,7 @@ Qt4BuildConfiguration *Qt4Project::addQt4BuildConfiguration(QString displayName,
cleanStep
->
setClean
(
true
);
bc
->
insertCleanStep
(
0
,
cleanStep
);
if
(
!
additionalArguments
.
isEmpty
())
qmakeStep
->
set
QMake
Arguments
(
additionalArguments
);
qmakeStep
->
set
User
Arguments
(
additionalArguments
);
// set some options for qmake and make
if
(
qmakeBuildConfiguration
&
QtVersion
::
BuildAll
)
// debug_and_release => explicit targets
...
...
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View file @
16fcb82d
...
...
@@ -298,7 +298,7 @@ void Qt4ProjectConfigWidget::importLabelClicked()
// Combo box will be updated at the end
QMakeStep
*
qmakeStep
=
m_buildConfiguration
->
qmakeStep
();
qmakeStep
->
set
QMake
Arguments
(
additionalArguments
);
qmakeStep
->
set
User
Arguments
(
additionalArguments
);
MakeStep
*
makeStep
=
m_buildConfiguration
->
makeStep
();
m_buildConfiguration
->
setValue
(
"buildConfiguration"
,
int
(
qmakeBuildConfig
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment