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
Marco Bubke
flatpak-qt-creator
Commits
68e0c5c6
Commit
68e0c5c6
authored
Jun 15, 2010
by
Oswald Buddenhagen
Browse files
move value() implementation down to ProFileEvaluator
parent
3ef1bf0f
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/profilereader.cpp
View file @
68e0c5c6
...
...
@@ -87,16 +87,6 @@ QList<ProFile*> ProFileReader::includeFiles() const
return
list
;
}
QString
ProFileReader
::
value
(
const
QString
&
variable
)
const
{
const
QStringList
&
vals
=
values
(
variable
);
if
(
!
vals
.
isEmpty
())
return
vals
.
first
();
return
QString
();
}
void
ProFileReader
::
fileMessage
(
const
QString
&
message
)
{
Q_UNUSED
(
message
)
...
...
src/plugins/qt4projectmanager/profilereader.h
View file @
68e0c5c6
...
...
@@ -51,8 +51,6 @@ public:
bool
readProFile
(
const
QString
&
fileName
);
QList
<
ProFile
*>
includeFiles
()
const
;
QString
value
(
const
QString
&
variable
)
const
;
ProFile
*
proFileFor
(
const
QString
&
name
);
signals:
void
errorFound
(
const
QString
&
error
);
...
...
src/shared/proparser/profileevaluator.cpp
View file @
68e0c5c6
...
...
@@ -4080,6 +4080,15 @@ static QStringList expandEnvVars(const ProStringList &x)
return
ret
;
}
QString
ProFileEvaluator
::
value
(
const
QString
&
variable
)
const
{
const
QStringList
&
vals
=
values
(
variable
);
if
(
!
vals
.
isEmpty
())
return
vals
.
first
();
return
QString
();
}
QStringList
ProFileEvaluator
::
values
(
const
QString
&
variableName
)
const
{
return
expandEnvVars
(
d
->
values
(
ProString
(
variableName
)));
...
...
src/shared/proparser/profileevaluator.h
View file @
68e0c5c6
...
...
@@ -90,6 +90,7 @@ public:
bool
accept
(
ProFile
*
pro
);
bool
contains
(
const
QString
&
variableName
)
const
;
QString
value
(
const
QString
&
variableName
)
const
;
QStringList
values
(
const
QString
&
variableName
)
const
;
QStringList
values
(
const
QString
&
variableName
,
const
ProFile
*
pro
)
const
;
QStringList
absolutePathValues
(
const
QString
&
variable
,
const
QString
&
baseDirectory
)
const
;
...
...
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