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
Marco Bubke
flatpak-qt-creator
Commits
26c903ce
Commit
26c903ce
authored
Jul 29, 2009
by
dt
Browse files
Fix for #Command not having a -spec argument.
parent
027a1984
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4project.cpp
View file @
26c903ce
...
...
@@ -1157,7 +1157,6 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
QString
actualSpec
=
extractSpecFromArgumentList
(
qs
->
value
(
buildConfiguration
,
"qmakeArgs"
).
toStringList
());
if
(
actualSpec
.
isEmpty
())
actualSpec
=
version
->
mkspec
();
QString
parsedSpec
=
extractSpecFromArgumentList
(
result
.
second
);
// Now to convert the actualSpec to a absolute path, we go through a few hops
if
(
QFileInfo
(
actualSpec
).
isRelative
())
{
...
...
@@ -1176,6 +1175,11 @@ bool Qt4Project::compareBuildConfigurationToImportFrom(const QString &buildConfi
}
}
QString
parsedSpec
=
extractSpecFromArgumentList
(
result
.
second
);
// if the MakeFile did not contain a mkspec, then it is the default for that qmake
if
(
parsedSpec
.
isEmpty
())
parsedSpec
=
version
->
sourcePath
()
+
"/mkspecs/"
+
version
->
mkspec
();
if
(
QFileInfo
(
parsedSpec
).
isRelative
())
parsedSpec
=
QDir
::
cleanPath
(
workingDirectory
+
"/"
+
parsedSpec
);
...
...
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