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
bdc0d42e
Commit
bdc0d42e
authored
Jan 29, 2009
by
goro
Browse files
Make patcher not abort on errors
parent
fc67b043
Changes
1
Show whitespace changes
Inline
Side-by-side
src/tools/qtlibspatcher/qtlibspatchermain.cpp
View file @
bdc0d42e
...
...
@@ -85,13 +85,13 @@ bool patchBinaryWithQtPathes(const char *fileName, const char *baseQtPath)
logFileName
(
fileName
);
for
(
int
i
=
0
;
i
<
(
int
)(
sizeof
(
variables
)
/
sizeof
(
variables
[
0
]));
i
++
)
{
const
char
*
const
newStr
=
allocFileNameCopyAppend
(
variables
[
i
].
variable
,
baseQtPath
,
variables
[
i
].
subDirectory
);
const
char
*
const
newStr
=
allocFileNameCopyAppend
(
variables
[
i
].
variable
,
baseQtPath
,
variables
[
i
].
subDirectory
);
BinPatch
binFile
(
fileName
);
const
bool
success
=
binFile
.
patch
(
variables
[
i
].
variable
,
newStr
);
delete
[]
newStr
;
if
(
!
success
)
{
result
=
false
;
break
;
}
}
...
...
@@ -119,7 +119,6 @@ bool patchBinariesWithQtPathes(const char *baseQtPath)
delete
[]
fileName
;
if
(
!
success
)
{
result
=
false
;
break
;
}
}
...
...
@@ -602,9 +601,6 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath)
delete
[]
fileName
;
delete
[]
oldSourcePath
;
delete
[]
newSourcePath
;
if
(
!
result
)
break
;
}
return
result
;
...
...
@@ -774,8 +770,8 @@ int main(int argc, char *args[])
break
;
patchTextFiles
(
baseQtPath
);
const
bool
success
=
patchBinariesWithQtPathes
(
baseQtPath
)
&&
patchDebugLibrariesWithQtPath
(
baseQtPath
);
const
bool
success
One
=
patchBinariesWithQtPathes
(
baseQtPath
)
;
const
bool
successTwo
=
patchDebugLibrariesWithQtPath
(
baseQtPath
);
delete
[]
baseQtPath
;
return
success
?
0
:
1
;
return
(
success
One
&&
successTwo
)
?
0
:
1
;
}
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