Skip to content
GitLab
Menu
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
958de99a
Commit
958de99a
authored
Jan 14, 2009
by
Daniel Molkentin
Browse files
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
parents
3908528f
109f04ac
Changes
1
Show whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4nodes.cpp
View file @
958de99a
...
@@ -848,9 +848,7 @@ ProFileReader *Qt4PriFileNode::createProFileReader() const
...
@@ -848,9 +848,7 @@ ProFileReader *Qt4PriFileNode::createProFileReader() const
reader
->
setQtVersion
(
version
);
reader
->
setQtVersion
(
version
);
}
}
QHash
<
QString
,
QStringList
>
variables
;
reader
->
setOutputDir
(
m_qt4ProFileNode
->
buildDir
());
variables
.
insert
(
QLatin1String
(
"OUT_PWD"
),
QStringList
(
m_qt4ProFileNode
->
buildDir
()));
reader
->
addVariables
(
variables
);
return
reader
;
return
reader
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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