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
a29a5b43
Commit
a29a5b43
authored
Sep 08, 2010
by
Friedemann Kleint
Browse files
Maemo: Fix madlist crashing due to missing DLL on Windows.
Reviewed-by: kh
parent
7528b3b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
View file @
a29a5b43
...
...
@@ -106,13 +106,20 @@ bool MaemoManager::isValidMaemoQtVersion(const QtVersion *version) const
if
(
!
QFileInfo
(
madAdminCommand
).
exists
())
return
false
;
QProcess
madAdminProc
;
QStringList
arguments
(
QLatin1String
(
"list"
));
#ifdef Q_OS_WIN
QProcessEnvironment
env
=
QProcessEnvironment
::
systemEnvironment
();
env
.
insert
(
QLatin1String
(
"PATH"
),
QDir
::
toNativeSeparators
(
dir
.
absolutePath
()
%
QLatin1String
(
"/bin"
))
%
QLatin1Char
(
';'
)
%
env
.
value
(
QLatin1String
(
"PATH"
)));
madAdminProc
.
setProcessEnvironment
(
env
);
arguments
.
prepend
(
madAdminCommand
);
madAdminCommand
=
dir
.
absolutePath
()
+
QLatin1String
(
"/bin/sh.exe"
);
#endif
QProcess
madAdminProc
;
madAdminProc
.
start
(
madAdminCommand
,
arguments
);
if
(
!
madAdminProc
.
waitForStarted
()
||
!
madAdminProc
.
waitForFinished
())
return
false
;
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View file @
a29a5b43
...
...
@@ -678,6 +678,10 @@ QString MaemoQemuManager::runtimeForQtVersion(const QString &qmakeCommand) const
QProcessEnvironment
env
=
QProcessEnvironment
::
systemEnvironment
();
env
.
insert
(
"HOME"
,
QDesktopServices
::
storageLocation
(
QDesktopServices
::
HomeLocation
));
env
.
insert
(
QLatin1String
(
"PATH"
),
QDir
::
toNativeSeparators
(
madRoot
%
QLatin1String
(
"/bin"
))
%
QLatin1Char
(
';'
)
%
env
.
value
(
QLatin1String
(
"PATH"
)));
madProc
.
setProcessEnvironment
(
env
);
arguments
.
prepend
(
madCommand
);
...
...
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