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
772a9a94
Commit
772a9a94
authored
Oct 06, 2009
by
Friedemann Kleint
Browse files
Trk/S60: Determine symbol file correctly.
parent
695b1dbf
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
772a9a94
...
...
@@ -209,9 +209,18 @@ static QString localExecutableFromPkgFile(const QString &pkgFileName, QString *e
// "<SDK>/foo.exe" - "!:\device_bin\foo.exe"
const
QRegExp
exePattern
=
QRegExp
(
QLatin1String
(
"^
\"
([^
\"
]+
\\
.exe)
\"
+-.*$"
));
Q_ASSERT
(
exePattern
.
isValid
());
foreach
(
const
QString
&
line
,
QString
::
fromLocal8Bit
(
pkgFile
.
readAll
()).
split
(
QLatin1Char
(
'\n'
)))
if
(
exePattern
.
exactMatch
(
line
))
return
exePattern
.
cap
(
1
);
foreach
(
const
QString
&
line
,
QString
::
fromLocal8Bit
(
pkgFile
.
readAll
()).
split
(
QLatin1Char
(
'\n'
)))
{
if
(
exePattern
.
exactMatch
(
line
))
{
QString
rc
=
exePattern
.
cap
(
1
);
#ifdef Q_OS_WIN
// Sometimes, the drive letter is missing. Use that of the pkg file
if
(
rc
.
at
(
0
)
==
QLatin1Char
(
'/'
))
rc
.
insert
(
0
,
pkgFileName
.
left
(
2
));
#endif
return
rc
;
}
}
*
errorMessage
=
S60DeviceRunConfiguration
::
tr
(
"Unable to find the executable in the package file %1."
).
arg
(
pkgFileName
);
return
QString
();
}
...
...
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