Skip to content

Commit c721bc9

Browse files
authored
1 parent fcc2a03 commit c721bc9

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ after_success:
2121
- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
2222
# quick fix for issue 223
2323
- if [ "$TRAVIS_TAG" != "$TRAVIS_BRANCH" ] && [ "$TRAVIS_BRANCH" != "master" ]; then export TRAVIS_EVENT_TYPE=pull_request; fi
24-
- bash ./upload.sh ./linuxdeployqt-*.AppImage*
24+
- bash ./upload.sh ./linuxdeployqt-*.AppImage* pvs-studio-report.*
2525

2626
after_script:
2727
- "xpra stop :99"

tests/tests-ci.sh

+12-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,18 @@ set -x
44

55
source /opt/qt*/bin/qt*-env.sh
66
/opt/qt*/bin/qmake CONFIG+=release CONFIG+=force_debug_info linuxdeployqt.pro
7-
make -j
7+
# make -j$(nproc) # Not doing here but below with "pvs-tool trace"
8+
9+
# Test
10+
wget -q -O - http://files.viva64.com/etc/pubkey.txt | sudo apt-key add -
11+
sudo wget -O /etc/apt/sources.list.d/viva64.list http://files.viva64.com/etc/viva64.list
12+
sudo apt-get update
13+
sudo apt-get -y install --no-install-recommends pvs-studio
14+
pvs-studio-analyzer credentials [email protected] $PVS_KEY -o ./licence.lic
15+
pvs-studio-analyzer trace -- make -j$(nproc)
16+
pvs-studio-analyzer analyze -e /opt -e /usr -o pvs-studio.log -j $(nproc) -l ./licence.lic
17+
plog-converter -a GA:1,2 -t tasklist -o pvs-studio-report.txt pvs-studio.log
18+
rm ./licence.lic
819

920
# exit on failure
1021
set -e

tools/linuxdeployqt/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ int main(int argc, char **argv)
251251
QString desktopExecEntry = "";
252252
QString desktopIconEntry = "";
253253

254-
if (argc > 1) {
254+
if (argc > 2) {
255255
/* If we got a desktop file as the argument, try to figure out the application binary from it.
256256
* This has the advantage that we can also figure out the icon file this way, and have less work
257257
* to do when using linuxdeployqt. */

tools/linuxdeployqt/shared.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath,
514514
}
515515
qtPath += (currentPart + "/");
516516

517-
} if (state == LibraryName) {
517+
} else if (state == LibraryName) {
518518
name = currentPart;
519519
info.isDylib = true;
520520
info.libraryName = name;
@@ -785,7 +785,7 @@ QString runPatchelf(QStringList options)
785785
bool patchQtCore(const QString &path, const QString &variable, const QString &value)
786786
{
787787
return true; // ################################### Disabling for now since using qt.conf
788-
QFile file(path);
788+
/* QFile file(path);
789789
if (!file.open(QIODevice::ReadWrite)) {
790790
LogWarning() << QString::fromLatin1("Unable to patch %1: %2").arg(
791791
QDir::toNativeSeparators(path), file.errorString());
@@ -828,6 +828,7 @@ bool patchQtCore(const QString &path, const QString &variable, const QString &va
828828
return false;
829829
}
830830
return true;
831+
*/
831832
}
832833

833834
void changeIdentification(const QString &id, const QString &binaryPath)

0 commit comments

Comments
 (0)