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
2f1993e4
Commit
2f1993e4
authored
Apr 04, 2011
by
Oswald Buddenhagen
Browse files
don't re-implement QDir::canonicalFilePath() by hand
parent
2e739d8e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
2f1993e4
...
...
@@ -1487,7 +1487,7 @@ void QtVersion::updateAbiAndMkspec() const
mkspecFullPath
=
baseMkspecDir
+
"/macx-g++"
;
}
//resolve mkspec link
mkspecFullPath
=
resolveLink
(
mkspecFullPath
);
mkspecFullPath
=
QFileInfo
(
mkspecFullPath
)
.
canonicalFilePath
()
;
}
break
;
}
...
...
@@ -1495,7 +1495,7 @@ void QtVersion::updateAbiAndMkspec() const
f2
.
close
();
}
#else
mkspecFullPath
=
resolveLink
(
mkspecFullPath
);
mkspecFullPath
=
QFileInfo
(
mkspecFullPath
)
.
canonicalFilePath
()
;
#endif
#ifdef Q_OS_WIN
...
...
@@ -1650,17 +1650,6 @@ void QtVersion::updateAbiAndMkspec() const
}
}
QString
QtVersion
::
resolveLink
(
const
QString
&
path
)
const
{
QFileInfo
f
(
path
);
int
links
=
16
;
while
(
links
--
&&
f
.
isSymLink
())
f
.
setFile
(
f
.
symLinkTarget
());
if
(
links
<=
0
)
return
QString
();
return
f
.
filePath
();
}
QString
QtVersion
::
qtCorePath
()
const
{
QList
<
QDir
>
dirs
;
...
...
src/plugins/qt4projectmanager/qtversionmanager.h
View file @
2f1993e4
...
...
@@ -201,7 +201,6 @@ private:
void
updateVersionInfo
()
const
;
QString
findQtBinary
(
const
QStringList
&
possibleName
)
const
;
void
updateAbiAndMkspec
()
const
;
QString
resolveLink
(
const
QString
&
path
)
const
;
QString
qtCorePath
()
const
;
QString
m_displayName
;
...
...
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