Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tobias Hunger
qt-creator
Commits
c9f7d779
Commit
c9f7d779
authored
Mar 02, 2011
by
Tobias Hunger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle static Qt libraries on mac
parent
3bf818ad
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
161 additions
and
104 deletions
+161
-104
src/plugins/projectexplorer/abi.cpp
src/plugins/projectexplorer/abi.cpp
+147
-98
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
+14
-6
No files found.
src/plugins/projectexplorer/abi.cpp
View file @
c9f7d779
This diff is collapsed.
Click to expand it.
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
c9f7d779
...
...
@@ -1591,6 +1591,7 @@ QString QtVersion::qtCorePath() const
dirs
<<
QDir
(
libraryInstallPath
())
<<
QDir
(
versionInfo
().
value
(
QLatin1String
(
"QT_INSTALL_BINS"
)));
foreach
(
const
QDir
&
d
,
dirs
)
{
QFileInfoList
infoList
=
d
.
entryInfoList
();
QFileInfoList
staticLibs
;
foreach
(
const
QFileInfo
&
info
,
infoList
)
{
const
QString
file
=
info
.
fileName
();
if
(
info
.
isDir
()
...
...
@@ -1600,14 +1601,21 @@ QString QtVersion::qtCorePath() const
const
QString
libName
=
file
.
left
(
file
.
lastIndexOf
(
'.'
));
return
info
.
absoluteFilePath
()
+
'/'
+
libName
;
}
if
(
info
.
isReadable
()
&&
(
file
.
startsWith
(
QLatin1String
(
"libQtCore"
))
||
file
.
startsWith
(
QLatin1String
(
"QtCore"
)))
&&
(
file
.
endsWith
(
QLatin1String
(
".dll"
))
||
file
.
endsWith
(
QString
::
fromLatin1
(
".so."
)
+
qtVersionString
())))
{
return
info
.
absoluteFilePath
();
if
(
info
.
isReadable
())
{
if
(
file
.
startsWith
(
QLatin1String
(
"libQtCore"
))
||
file
.
startsWith
(
QLatin1String
(
"QtCore"
)))
{
// Only handle static libs if we can not find dynamic ones:
if
(
file
.
endsWith
(
".a"
))
staticLibs
.
append
(
file
);
else
if
(
file
.
endsWith
(
QLatin1String
(
".dll"
))
||
file
.
endsWith
(
QString
::
fromLatin1
(
".so."
)
+
qtVersionString
()))
return
info
.
absoluteFilePath
();
}
}
}
// Return path to first static library found:
if
(
!
staticLibs
.
isEmpty
())
return
staticLibs
.
at
(
0
).
absoluteFilePath
();
}
return
QString
();
}
...
...
Write
Preview
Markdown
is supported
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