Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
7ea4d2bb
Commit
7ea4d2bb
authored
Nov 18, 2010
by
Daniel Molkentin
Browse files
Make preferred version work in all cases
Reviewed-by: dt
parent
eb63db5c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
7ea4d2bb
...
...
@@ -242,8 +242,15 @@ void QtVersionManager::updateExamples()
}
// in SDKs, we want to prefer the Qt version shipping with the SDK
QString
preferred
=
Core
::
ICore
::
instance
()
->
settings
()
->
value
(
"General/PreferredQMakePath"
).
toString
();
QSettings
*
settings
=
Core
::
ICore
::
instance
()
->
settings
();
QString
preferred
=
settings
->
value
(
QLatin1String
(
"PreferredQMakePath"
)).
toString
();
preferred
=
QDir
::
fromNativeSeparators
(
preferred
);
if
(
!
preferred
.
isEmpty
())
{
#ifdef Q_OS_WIN
preferred
=
preferred
.
toLower
();
if
(
!
preferred
.
endsWith
(
QLatin1String
(
".exe"
)))
preferred
.
append
(
QLatin1String
(
".exe"
));
#endif
foreach
(
version
,
candidates
)
{
if
(
version
->
qmakeCommand
()
==
preferred
)
{
emit
updateExamples
(
version
->
examplesPath
(),
version
->
demosPath
(),
version
->
sourcePath
());
...
...
Write
Preview
Supports
Markdown
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