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
6ca55f20
Commit
6ca55f20
authored
Dec 17, 2009
by
con
Browse files
Provide a way for installers to prefill some more Qt parameters.
parent
a54205c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
6ca55f20
...
...
@@ -294,7 +294,9 @@ void QtVersionManager::addNewVersionsFromInstaller()
{
// Add new versions which may have been installed by the WB installer in the form:
// NewQtVersions="qt 4.3.2=c:\\qt\\qt432\bin\qmake.exe;qt embedded=c:\\qtembedded;"
// or NewQtVersions="qt 4.3.2=c:\\qt\\qt432bin\qmake.exe=c:\\qtcreator\\mingw\\=prependToPath;
// or NewQtVersions="qt 4.3.2=c:\\qt\\qt432bin\qmake.exe=c:\\qtcreator\\mingw\\;
// i.e.
// NewQtVersions="versionname=pathtoversion=mingw=s60sdk=gcce=carbide;"
// Duplicate entries are not added, the first new version is set as default.
QSettings
*
settings
=
Core
::
ICore
::
instance
()
->
settings
();
...
...
@@ -312,11 +314,17 @@ void QtVersionManager::addNewVersionsFromInstaller()
bool
defaultVersionWasReset
=
false
;
foreach
(
QString
newVersion
,
newVersionsList
)
{
QStringList
newVersionData
=
newVersion
.
split
(
'='
);
if
(
newVersionData
.
count
()
>=
2
)
{
if
(
newVersionData
.
count
()
>=
2
)
{
if
(
QFile
::
exists
(
newVersionData
[
1
]))
{
QtVersion
*
version
=
new
QtVersion
(
newVersionData
[
0
],
newVersionData
[
1
],
m_idcount
++
);
if
(
newVersionData
.
count
()
>=
3
)
version
->
setMingwDirectory
(
newVersionData
[
2
]);
if
(
newVersionData
.
count
()
>=
4
)
version
->
setS60SDKDirectory
(
newVersionData
[
3
]);
if
(
newVersionData
.
count
()
>=
5
)
version
->
setGcceDirectory
(
newVersionData
[
4
]);
if
(
newVersionData
.
count
()
>=
6
)
version
->
setMwcDirectory
(
newVersionData
[
5
]);
bool
versionWasAlreadyInList
=
false
;
foreach
(
const
QtVersion
*
const
it
,
m_versions
)
{
...
...
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