github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 19:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CI] Fixed CI Builds

Browse Source 
Former-commit-id: a296d8ab4a
This commit is contained in:
Leroy.H.Y 2019-09-14 20:13:42 +08:00
parent 5405f08bfe
commit a80d1ac088
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -25,7 +25,6 @@ script:
- git submodule update --init - git submodule update --init
- lrelease ./Qv2ray.pro - lrelease ./Qv2ray.pro
- mkdir build && cd ./build - mkdir build && cd ./build
- if [ "$BADGE" = "linux" ]; then qtchooser -install qt511 /opt/qt511/bin/qmake; fi - if [ "$BADGE" = "linux" ]; then /opt/qt511/bin/qmake ../ "QV2RAY_LRELEASE=true"; fi
- if [ "$BADGE" = "linux" ]; then qmake "QV2RAY_LRELEASE=true" -qt=qt511 ../; fi
- if [ "$BADGE" = "osx" ]; then qmake "QV2RAY_LRELEASE=true" ../; fi - if [ "$BADGE" = "osx" ]; then qmake "QV2RAY_LRELEASE=true" ../; fi
- make - make

2
Qv2ray.pro
View File

@ -69,7 +69,7 @@ for(var, $$list($$files("*.ts", true))) {
LOCALE_FILENAME = $$basename(var) LOCALE_FILENAME = $$basename(var)
!equals(LOCALE_FILENAME, "source.ts") { !equals(LOCALE_FILENAME, "source.ts") {
message(Found: $$LOCALE_FILENAME) message(Found: $$LOCALE_FILENAME)
LOCALES += , \\\"$${replace(LOCALE_FILENAME, ".ts", "")}\\\" LOCALES += \\\" $${replace(LOCALE_FILENAME, ".ts", "")}\\\"
TRANSLATION_COUNT = $$num_add($$TRANSLATION_COUNT, 1) TRANSLATION_COUNT = $$num_add($$TRANSLATION_COUNT, 1)
# ONLY USED IN LRELEASE CONTEXT # ONLY USED IN LRELEASE CONTEXT

2
src/w_PrefrencesWindow.cpp
View File

@ -18,7 +18,7 @@ PrefrencesWindow::PrefrencesWindow(QWidget *parent) : QDialog(parent),
ui->setupUi(this); ui->setupUi(this);
// We add locales // We add locales
ui->languageComboBox->clear(); ui->languageComboBox->clear();
QStringList locales { "en-US" QV_INSERT_LOCALES }; QStringList locales { QSTRING("en-US " QV_INSERT_LOCALES).split(" ", QString::SkipEmptyParts) };
ui->languageComboBox->addItems(locales); ui->languageComboBox->addItems(locales);
// //
ui->qvVersion->setText(QV2RAY_VERSION_STRING); ui->qvVersion->setText(QV2RAY_VERSION_STRING);