projects
/
platform
/
upstream
/
qttools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc4ed9e
)
Remove duplicate expression on both sides of '||'
author
Sergio Ahumada
<sahumada@blackberry.com>
Tue, 10 Feb 2015 10:04:11 +0000
(11:04 +0100)
committer
Sergio Ahumada
<sahumada@texla.cl>
Tue, 10 Feb 2015 15:38:17 +0000
(15:38 +0000)
Change-Id: I09601b4ed4b5d9c9e3e373508f5413d0858bb414
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
src/androiddeployqt/main.cpp
patch
|
blob
|
history
diff --git
a/src/androiddeployqt/main.cpp
b/src/androiddeployqt/main.cpp
index
3b5f42a
..
4bfe16b
100644
(file)
--- a/
src/androiddeployqt/main.cpp
+++ b/
src/androiddeployqt/main.cpp
@@
-2098,7
+2098,6
@@
bool copyQtFiles(Options *options)
relativePath.remove(0, 1);
if ((relativePath.startsWith("lib/") && relativePath.endsWith(".so"))
|| relativePath.startsWith("jar/")
- || relativePath.startsWith("plugins/")
|| relativePath.startsWith("imports/")
|| relativePath.startsWith("qml/")
|| relativePath.startsWith("plugins/")) {