Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tobias Hunger
qt-creator
Commits
b4d38705
Commit
b4d38705
authored
May 12, 2011
by
dt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix whitespace/coding style
parent
8e171e0b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
src/plugins/qt4projectmanager/baseqtversion.cpp
src/plugins/qt4projectmanager/baseqtversion.cpp
+2
-2
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
...gins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
+1
-1
src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp
src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp
+1
-1
src/plugins/qt4projectmanager/qt4project.cpp
src/plugins/qt4projectmanager/qt4project.cpp
+1
-1
src/plugins/qt4projectmanager/qtoptionspage.cpp
src/plugins/qt4projectmanager/qtoptionspage.cpp
+1
-1
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
+2
-2
No files found.
src/plugins/qt4projectmanager/baseqtversion.cpp
View file @
b4d38705
...
...
@@ -259,7 +259,7 @@ QVariantMap BaseQtVersion::toMap() const
bool
BaseQtVersion
::
isValid
()
const
{
if
(
uniqueId
()
==
-
1
||
displayName
().
isEmpty
())
if
(
uniqueId
()
==
-
1
||
displayName
().
isEmpty
())
return
false
;
updateVersionInfo
();
updateMkspec
();
...
...
@@ -575,7 +575,7 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
{
QStringList
configValues
=
evaluator
->
values
(
"CONFIG"
);
m_defaultConfigIsDebugAndRelease
=
false
;
foreach
(
const
QString
&
value
,
configValues
)
{
foreach
(
const
QString
&
value
,
configValues
)
{
if
(
value
==
"debug"
)
m_defaultConfigIsDebug
=
true
;
else
if
(
value
==
"release"
)
...
...
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
View file @
b4d38705
...
...
@@ -204,7 +204,7 @@ ProjectExplorer::Target *Qt4SymbianTargetFactory::create(ProjectExplorer::Projec
infos
.
append
(
BuildConfigurationInfo
(
qtVersion
,
config
,
QString
(),
QString
()));
infos
.
append
(
BuildConfigurationInfo
(
qtVersion
,
config
^
BaseQtVersion
::
DebugBuild
,
QString
(),
QString
()));
}
else
{
if
(
config
&
BaseQtVersion
::
DebugBuild
)
if
(
config
&
BaseQtVersion
::
DebugBuild
)
infos
.
append
(
BuildConfigurationInfo
(
qtVersion
,
config
,
QString
(),
QString
()));
else
infos
.
append
(
BuildConfigurationInfo
(
qtVersion
,
config
^
BaseQtVersion
::
DebugBuild
,
QString
(),
QString
()));
...
...
src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp
View file @
b4d38705
...
...
@@ -93,7 +93,7 @@ bool SymbianQtVersion::isValid() const
return
false
;
if
(
!
m_validSystemRoot
)
return
false
;
if
(
isBuildWithSymbianSbsV2
()
&&
(
m_sbsV2Directory
.
isEmpty
()
||
!
QFileInfo
(
m_sbsV2Directory
+
QLatin1String
(
"/sbs"
)).
exists
()))
if
(
isBuildWithSymbianSbsV2
()
&&
(
m_sbsV2Directory
.
isEmpty
()
||
!
QFileInfo
(
m_sbsV2Directory
+
QLatin1String
(
"/sbs"
)).
exists
()))
return
false
;
return
true
;
}
...
...
src/plugins/qt4projectmanager/qt4project.cpp
View file @
b4d38705
...
...
@@ -445,7 +445,7 @@ void Qt4Project::updateCppCodeModel()
predefinedMacros
=
tc
->
predefinedMacros
();
QList
<
HeaderPath
>
headers
=
tc
->
systemHeaderPaths
();
if
(
activeBC
->
qtVersion
())
if
(
activeBC
->
qtVersion
())
headers
.
append
(
activeBC
->
qtVersion
()
->
systemHeaderPathes
());
foreach
(
const
HeaderPath
&
headerPath
,
headers
)
{
if
(
headerPath
.
kind
()
==
HeaderPath
::
FrameworkHeaderPath
)
...
...
src/plugins/qt4projectmanager/qtoptionspage.cpp
View file @
b4d38705
...
...
@@ -128,7 +128,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<BaseQtVersion *>
,
m_configurationWidget
(
0
)
{
// Initialize m_versions
foreach
(
BaseQtVersion
*
version
,
versions
)
foreach
(
BaseQtVersion
*
version
,
versions
)
m_versions
.
push_back
(
version
->
clone
());
QWidget
*
versionInfoWidget
=
new
QWidget
();
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
b4d38705
...
...
@@ -435,7 +435,7 @@ QList<BaseQtVersion *> QtVersionManager::versions() const
QList
<
BaseQtVersion
*>
QtVersionManager
::
validVersions
()
const
{
QList
<
BaseQtVersion
*>
results
;
foreach
(
BaseQtVersion
*
v
,
m_versions
)
{
foreach
(
BaseQtVersion
*
v
,
m_versions
)
{
if
(
v
->
isValid
())
results
.
append
(
v
);
}
...
...
@@ -585,7 +585,7 @@ QString QtVersionManager::findQMakeBinaryFromMakefile(const QString &makefile)
BaseQtVersion
*
QtVersionManager
::
qtVersionForQMakeBinary
(
const
QString
&
qmakePath
)
{
foreach
(
BaseQtVersion
*
version
,
versions
())
{
foreach
(
BaseQtVersion
*
version
,
versions
())
{
if
(
version
->
qmakeCommand
()
==
qmakePath
)
{
return
version
;
break
;
...
...
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