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
7a0c5851
Commit
7a0c5851
authored
Apr 14, 2011
by
Tobias Hunger
Browse files
Qt4Bc: Do not store/restore tool chains
The plain BuildConfiguration aleady does that for us.
parent
9a0dce58
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View file @
7a0c5851
...
...
@@ -60,7 +60,6 @@ const char * const QT4_BC_ID("Qt4ProjectManager.Qt4BuildConfiguration");
const
char
*
const
USE_SHADOW_BUILD_KEY
(
"Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild"
);
const
char
*
const
BUILD_DIRECTORY_KEY
(
"Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"
);
const
char
*
const
TOOLCHAIN_KEY
(
"Qt4ProjectManager.Qt4BuildConfiguration.ToolChain"
);
const
char
*
const
BUILD_CONFIGURATION_KEY
(
"Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration"
);
const
char
*
const
QT_VERSION_ID_KEY
(
"Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId"
);
...
...
@@ -112,7 +111,6 @@ QVariantMap Qt4BuildConfiguration::toMap() const
map
.
insert
(
QLatin1String
(
USE_SHADOW_BUILD_KEY
),
m_shadowBuild
);
map
.
insert
(
QLatin1String
(
BUILD_DIRECTORY_KEY
),
m_buildDirectory
);
map
.
insert
(
QLatin1String
(
QT_VERSION_ID_KEY
),
m_qtVersionId
);
map
.
insert
(
QLatin1String
(
TOOLCHAIN_KEY
),
toolChain
()
?
toolChain
()
->
id
()
:
QLatin1String
(
"<UNSET>"
));
map
.
insert
(
QLatin1String
(
BUILD_CONFIGURATION_KEY
),
int
(
m_qmakeBuildConfiguration
));
return
map
;
}
...
...
@@ -133,8 +131,7 @@ bool Qt4BuildConfiguration::fromMap(const QVariantMap &map)
m_shadowBuild
=
map
.
value
(
QLatin1String
(
USE_SHADOW_BUILD_KEY
),
true
).
toBool
();
m_qtVersionId
=
map
.
value
(
QLatin1String
(
QT_VERSION_ID_KEY
)).
toInt
();
ProjectExplorer
::
ToolChain
*
tc
=
0
;
tc
=
ProjectExplorer
::
ToolChainManager
::
instance
()
->
findToolChain
(
map
.
value
(
QLatin1String
(
TOOLCHAIN_KEY
)).
toString
());
ProjectExplorer
::
ToolChain
*
tc
=
toolChain
();
m_qmakeBuildConfiguration
=
QtVersion
::
QmakeBuildConfigs
(
map
.
value
(
QLatin1String
(
BUILD_CONFIGURATION_KEY
)).
toInt
());
m_buildDirectory
=
map
.
value
(
QLatin1String
(
BUILD_DIRECTORY_KEY
),
defaultShadowBuildDirectory
()).
toString
();
...
...
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