StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.17-dev'

Browse Source
This commit is contained in:
Anthony Bilinski 2020-02-22 14:18:26 -08:00
commit 13cf04fad9
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -271,12 +271,12 @@ deploy:
after_success:
- >
test $TRAVIS_PULL_REQUEST == "false"
&& test $TRAVIS_BRANCH == "master"
&& test $JOB == "build-docs"
test "$TRAVIS_PULL_REQUEST" == "false"
&& test "$TRAVIS_BRANCH" == "master"
&& test "$JOB" == "build-docs"
&& bash ./.travis/deploy-docs.sh
- >
test $TRAVIS_PULL_REQUEST == "false"
&& test $TRAVIS_BRANCH == "master"
&& test $JOB == "build-gitstats"
test "$TRAVIS_PULL_REQUEST" == "false"
&& test "$TRAVIS_BRANCH" == "master"
&& test "$JOB" == "build-gitstats"
&& bash ./.travis/deploy-gitstats.sh

2
src/persistence/db/rawdatabase.cpp
View File

@ -282,7 +282,7 @@ bool RawDatabase::setCipherParameters(int majorVersion, const QString& database)
return false;
}
}
qDebug() << "Setting SQLCipher 4.x parameters";
qDebug().nospace() << "Setting SQLCipher " << majorVersion << ".x parameters";
return execNow(defaultParams.replace("database.", prefix));
}