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
444a0b0e
Commit
444a0b0e
authored
Mar 12, 2009
by
con
Browse files
Fixes: subdir.file not supported
Task: 247566 RevBy: dt
parent
48f90a66
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4nodes.cpp
View file @
444a0b0e
...
...
@@ -904,13 +904,19 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
// Special case were subdir is just an identifier:
// "SUBDIR = subid
// subid.subdir = realdir"
// or
// "SUBDIR = subid
// subid.file = realdir/realfile.pro"
QString
realDir
;
QString
realFile
;
const
QString
subDirKey
=
subDirVar
+
QLatin1String
(
".subdir"
);
const
QString
subDirFileKey
=
subDirVar
+
QLatin1String
(
".file"
);
if
(
reader
->
contains
(
subDirKey
))
realDir
=
QFileInfo
(
reader
->
value
(
subDirKey
)).
filePath
();
else
else
if
(
reader
->
contains
(
subDirFileKey
))
realDir
=
QFileInfo
(
reader
->
value
(
subDirFileKey
)).
filePath
();
else
realDir
=
subDirVar
;
QFileInfo
info
(
realDir
);
if
(
!
info
.
isAbsolute
())
...
...
src/plugins/qt4projectmanager/qt4projectmanager.cpp
View file @
444a0b0e
...
...
@@ -130,13 +130,6 @@ QString Qt4Manager::mimeType() const
ProjectExplorer
::
Project
*
Qt4Manager
::
openProject
(
const
QString
&
fileName
)
{
typedef
QMultiMap
<
QString
,
QString
>
DependencyMap
;
const
QString
dotSubDir
=
QLatin1String
(
".subdir"
);
const
QString
dotDepends
=
QLatin1String
(
".depends"
);
const
QChar
slash
=
QLatin1Char
(
'/'
);
QString
errorMessage
;
Core
::
MessageManager
*
messageManager
=
Core
::
ICore
::
instance
()
->
messageManager
();
messageManager
->
displayStatusBarMessage
(
tr
(
"Loading project %1 ..."
).
arg
(
fileName
),
50000
);
...
...
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