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
6492101e
Commit
6492101e
authored
Sep 01, 2009
by
dt
Browse files
Fix importing adding a empty spec argument to qmake
parent
8d77f80b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/projectloadwizard.cpp
View file @
6492101e
...
...
@@ -69,15 +69,20 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W
QString
versionSpec
=
m_importVersion
->
sourcePath
()
+
"/mkspecs/"
+
m_importVersion
->
mkspec
();
QString
parsedSpec
=
Qt4Project
::
extractSpecFromArgumentList
(
m_additionalArguments
);
QString
parsedSpecOrginal
=
parsedSpec
;
if
(
QFileInfo
(
parsedSpec
).
isRelative
())
parsedSpec
=
QDir
::
cleanPath
(
directory
+
"/"
+
parsedSpec
);
m_additionalArguments
=
Qt4Project
::
removeSpecFromArgumentList
(
m_additionalArguments
);
if
(
parsedSpec
!=
versionSpec
)
{
m_additionalArguments
.
prepend
(
parsedSpecOrginal
);
m_additionalArguments
.
prepend
(
"-spec"
);
}
// Compare mkspecs and add to additional arguments
if
(
parsedSpec
.
isEmpty
())
{
// using the default spec, don't modify additional arguments
}
else
{
QString
parsedSpecOrginal
=
parsedSpec
;
if
(
QFileInfo
(
parsedSpec
).
isRelative
())
parsedSpec
=
QDir
::
cleanPath
(
directory
+
"/"
+
parsedSpec
);
m_additionalArguments
=
Qt4Project
::
removeSpecFromArgumentList
(
m_additionalArguments
);
if
(
parsedSpec
!=
versionSpec
)
{
m_additionalArguments
.
prepend
(
parsedSpecOrginal
);
m_additionalArguments
.
prepend
(
"-spec"
);
}
}
}
// So now we have the version and the configuration for that version
...
...
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