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
Marco Bubke
flatpak-qt-creator
Commits
4041a694
Commit
4041a694
authored
Nov 30, 2010
by
Christian Kandeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Maemo: Fix Qemu file path once instead of at every start.
Reviewed-by: kh1
parent
5f5dbc62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
20 deletions
+19
-20
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
+4
-19
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
...ins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
+15
-1
No files found.
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View file @
4041a694
...
...
@@ -352,12 +352,12 @@ void MaemoQemuManager::startRuntime()
}
m_runningQtId
=
version
->
uniqueId
();
const
QString
root
=
QDir
::
toNativeSeparators
(
MaemoGlobal
::
maddeRoot
(
version
->
qmakeCommand
())
+
QLatin1Char
(
'/'
));
const
MaemoQemuRuntime
rt
=
m_runtimes
.
value
(
version
->
uniqueId
());
QProcessEnvironment
env
=
QProcessEnvironment
::
systemEnvironment
();
#ifdef Q_OS_WIN
const
QString
root
=
QDir
::
toNativeSeparators
(
MaemoGlobal
::
maddeRoot
(
version
->
qmakeCommand
())
+
QLatin1Char
(
'/'
));
const
QLatin1Char
colon
(
';'
);
const
QLatin1String
key
(
"PATH"
);
env
.
insert
(
key
,
root
%
QLatin1String
(
"bin"
)
%
colon
%
env
.
value
(
key
));
...
...
@@ -369,22 +369,7 @@ void MaemoQemuManager::startRuntime()
m_qemuProcess
->
setProcessEnvironment
(
env
);
m_qemuProcess
->
setWorkingDirectory
(
rt
.
m_root
);
// This is complex because of extreme MADDE weirdness.
const
bool
pathIsRelative
=
QFileInfo
(
rt
.
m_bin
).
isRelative
();
const
QString
app
=
#ifdef Q_OS_WIN
root
%
(
pathIsRelative
?
QLatin1String
(
"madlib/"
)
%
rt
.
m_bin
// Fremantle.
:
rt
.
m_bin
)
// Haramattan.
%
QLatin1String
(
".exe"
);
#else
pathIsRelative
?
root
%
QLatin1String
(
"madlib/"
)
%
rt
.
m_bin
// Fremantle.
:
rt
.
m_bin
;
// Haramattan.
#endif
m_qemuProcess
->
start
(
app
%
QLatin1Char
(
' '
)
%
rt
.
m_args
,
QIODevice
::
ReadWrite
);
m_qemuProcess
->
start
(
rt
.
m_bin
%
QLatin1Char
(
' '
)
%
rt
.
m_args
);
if
(
!
m_qemuProcess
->
waitForStarted
())
return
;
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
View file @
4041a694
...
...
@@ -192,7 +192,21 @@ void MaemoQemuRuntimeParserV1::fillRuntimeInformation(MaemoQemuRuntime *runtime)
break
;
runtime
->
m_freePorts
.
addPort
(
port
.
toInt
());
}
return
;
// This is complex because of extreme MADDE weirdness.
const
QString
root
=
m_maddeRoot
+
QLatin1Char
(
'/'
);
const
bool
pathIsRelative
=
QFileInfo
(
runtime
->
m_bin
).
isRelative
();
runtime
->
m_bin
=
#ifdef Q_OS_WIN
root
+
(
pathIsRelative
?
QLatin1String
(
"madlib/"
)
+
runtime
->
m_bin
// Fremantle.
:
runtime
->
m_bin
)
// Harmattan.
+
QLatin1String
(
".exe"
);
#else
pathIsRelative
?
root
+
QLatin1String
(
"madlib/"
)
+
runtime
->
m_bin
// Fremantle.
:
runtime
->
m_bin
;
// Harmattan.
#endif
}
}
}
...
...
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