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
74f66a3b
Commit
74f66a3b
authored
Oct 06, 2009
by
dt
Browse files
Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3
parents
ee92e82c
7a135ac8
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/cpptools/cppfindreferences.cpp
View file @
74f66a3b
...
...
@@ -164,12 +164,20 @@ protected:
if
(
!
symbol
)
return
false
;
else
if
(
symbol
==
_declSymbol
)
else
if
(
symbol
==
_declSymbol
)
{
return
true
;
else
if
(
symbol
->
line
()
==
_declSymbol
->
line
()
&&
symbol
->
column
()
==
_declSymbol
->
column
())
{
}
else
if
(
symbol
->
line
()
==
_declSymbol
->
line
()
&&
symbol
->
column
()
==
_declSymbol
->
column
())
{
if
(
!
qstrcmp
(
symbol
->
fileName
(),
_declSymbol
->
fileName
()))
return
true
;
}
else
if
(
symbol
->
isForwardClassDeclaration
()
&&
(
_declSymbol
->
isClass
()
||
_declSymbol
->
isForwardClassDeclaration
()))
{
return
true
;
}
else
if
(
_declSymbol
->
isForwardClassDeclaration
()
&&
(
symbol
->
isClass
()
||
symbol
->
isForwardClassDeclaration
()))
{
return
true
;
}
return
false
;
...
...
@@ -467,7 +475,21 @@ static void find_helper(QFutureInterface<Utils::FileSearchResult> &future,
const
QString
sourceFile
=
QString
::
fromUtf8
(
symbol
->
fileName
(),
symbol
->
fileNameLength
());
QStringList
files
(
sourceFile
);
files
+=
snapshot
.
dependsOn
(
sourceFile
);
if
(
symbol
->
isClass
()
||
symbol
->
isForwardClassDeclaration
())
{
foreach
(
const
Document
::
Ptr
&
doc
,
snapshot
)
{
if
(
doc
->
fileName
()
==
sourceFile
)
continue
;
Control
*
control
=
doc
->
control
();
if
(
control
->
findIdentifier
(
symbolId
->
chars
(),
symbolId
->
size
()))
files
.
append
(
doc
->
fileName
());
}
}
else
{
files
+=
snapshot
.
dependsOn
(
sourceFile
);
}
qDebug
()
<<
"done in:"
<<
tm
.
elapsed
()
<<
"number of files to parse:"
<<
files
.
size
();
future
.
setProgressRange
(
0
,
files
.
size
());
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
74f66a3b
...
...
@@ -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