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
f643ab83
Commit
f643ab83
authored
Feb 22, 2011
by
dt
Browse files
Qt4ProjectManager: Remove dead code
parent
0609b5b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4project.cpp
View file @
f643ab83
...
...
@@ -451,25 +451,16 @@ void Qt4Project::updateCppCodeModel()
// Collect per .pro file information
foreach
(
Qt4ProFileNode
*
pro
,
proFiles
)
{
Internal
::
CodeModelInfo
info
;
info
.
defines
=
predefinedMacros
;
info
.
frameworkPaths
=
predefinedFrameworkPaths
;
info
.
precompiledHeader
=
pro
->
variableValue
(
PrecompiledHeaderVar
);
allPrecompileHeaders
.
append
(
info
.
precompiledHeader
);
allPrecompileHeaders
.
append
(
pro
->
variableValue
(
PrecompiledHeaderVar
));
// Add custom defines
foreach
(
const
QString
&
def
,
pro
->
variableValue
(
DefinesVar
))
{
allDefinedMacros
+=
"#define "
;
info
.
defines
+=
"#define "
;
const
int
index
=
def
.
indexOf
(
QLatin1Char
(
'='
));
if
(
index
==
-
1
)
{
allDefinedMacros
+=
def
.
toLatin1
();
allDefinedMacros
+=
" 1
\n
"
;
info
.
defines
+=
def
.
toLatin1
();
info
.
defines
+=
" 1
\n
"
;
}
else
{
const
QString
name
=
def
.
left
(
index
);
const
QString
value
=
def
.
mid
(
index
+
1
);
...
...
@@ -477,10 +468,6 @@ void Qt4Project::updateCppCodeModel()
allDefinedMacros
+=
' '
;
allDefinedMacros
+=
value
.
toLocal8Bit
();
allDefinedMacros
+=
'\n'
;
info
.
defines
+=
name
.
toLatin1
();
info
.
defines
+=
' '
;
info
.
defines
+=
value
.
toLocal8Bit
();
info
.
defines
+=
'\n'
;
}
}
...
...
@@ -488,8 +475,6 @@ void Qt4Project::updateCppCodeModel()
foreach
(
const
QString
&
includePath
,
proIncludePaths
)
{
if
(
!
allIncludePaths
.
contains
(
includePath
))
allIncludePaths
.
append
(
includePath
);
if
(
!
info
.
includes
.
contains
(
includePath
))
info
.
includes
.
append
(
includePath
);
}
#if 0 // Experimental PKGCONFIG support
...
...
@@ -507,17 +492,6 @@ void Qt4Project::updateCppCodeModel()
}
}
#endif
// Add mkspec directory
info
.
includes
.
append
(
activeBC
->
qtVersion
()
->
mkspecPath
());
info
.
includes
.
append
(
predefinedIncludePaths
);
// qDebug()<<"Dumping code model information";
// qDebug()<<"for .pro file"<< pro->path();
// qDebug()<<info.defines;
// qDebug()<<info.includes;
// qDebug()<<info.frameworkPaths;
// qDebug()<<"\n";
}
// Add mkspec directory
...
...
src/plugins/qt4projectmanager/qt4project.h
View file @
f643ab83
...
...
@@ -64,15 +64,6 @@ namespace Internal {
class
Qt4ProjectConfigWidget
;
class
Qt4NodesWatcher
;
class
CodeModelInfo
{
public:
QByteArray
defines
;
QStringList
includes
;
QStringList
frameworkPaths
;
QStringList
precompiledHeader
;
};
}
class
QMakeStep
;
...
...
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