Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable out-of-source build #503

Merged
merged 3 commits into from
Jan 7, 2020
Merged

Enable out-of-source build #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e89a0e
Use new stable version of `install-qt-action`.
boppybibbles Jan 4, 2020
7c5fa4e
Enable out-of-source builds.
boppybibbles Jan 4, 2020
7d873d8
Update all TS files because of changed source code.
boppybibbles Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ccpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Install Qt
uses: jurplel/install-qt-action@v1
uses: jurplel/install-qt-action@v2
- name: Install Linux packages
run: sudo apt update && sudo apt install -y --no-install-recommends libgl1-mesa-dev
- name: qmake
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ This document is still in a very early stage and needs a lot more work.

## Translations

* Add you language to the `qtpass.pro` file
under TRANSLATIONS and in the `resources.qrc` file.
* Add you language to the `src/src.pro` file
under TRANSLATIONS.
* Next run the command `qmake` which will create and update the localization files.
* Edit your file with (let's imagine your language is sv_SE (Swedish)
`linguist localization/localization_sv_SE.ts`
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_ar_MA.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translatorcomment>Flips interface</translatorcomment>
<translation>RTL</translation>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_ca.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_cs_CZ.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_de_DE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_de_LU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_el_GR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_en_GB.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_en_US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_es_ES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_fr_BE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_fr_FR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_fr_LU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_gl_ES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_he_IL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translatorcomment>Flips interface</translatorcomment>
<translation>RTL</translation>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_hu_HU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ Lejárat-dátum: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_it_IT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_lb_LU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_nb_NO.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>VTH</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_nl_BE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_nl_NL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_pl_PL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_pt_PT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_ru_RU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_sq_AL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translatorcomment>Kjo është për të mbajtur ndërfaqen nga e majta në të djathtë.</translatorcomment>
<translation>LTR</translation>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_sv_SE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation></translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_tr_TR.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation></translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion localization/localization_zh_CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ Expire-Date: 0
<context>
<name>QObject</name>
<message>
<location filename="../main/main.cpp" line="87"/>
<location filename="../main/main.cpp" line="88"/>
<source>LTR</source>
<translation>LTR</translation>
</message>
Expand Down
1 change: 1 addition & 0 deletions main/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ int main(int argc, char *argv[]) {
#endif

Q_INIT_RESOURCE(resources);
Q_INIT_RESOURCE(qmake_qmake_qm_files); // qmake names the file

QCoreApplication::setOrganizationName("IJHack");
QCoreApplication::setOrganizationDomain("ijhack.org");
Expand Down
28 changes: 0 additions & 28 deletions qtpass.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,32 +56,4 @@ CONFIG(coverage) {
QMAKE_DISTCLEAN += -r src/$$OBJECTS_DIR/lcov/
}

TRANSLATIONS += localization/localization_ca.ts \
localization/localization_nl_NL.ts \
localization/localization_nl_BE.ts \
localization/localization_de_DE.ts \
localization/localization_es_ES.ts \
localization/localization_gl_ES.ts \
localization/localization_hu_HU.ts \
localization/localization_sv_SE.ts \
localization/localization_pl_PL.ts \
localization/localization_ru_RU.ts \
localization/localization_he_IL.ts \
localization/localization_zh_CN.ts \
localization/localization_ar_MA.ts \
localization/localization_fr_FR.ts \
localization/localization_fr_BE.ts \
localization/localization_fr_LU.ts \
localization/localization_de_LU.ts \
localization/localization_lb_LU.ts \
localization/localization_en_GB.ts \
localization/localization_en_US.ts \
localization/localization_el_GR.ts \
localization/localization_cs_CZ.ts \
localization/localization_it_IT.ts \
localization/localization_sq_AL.ts \
localization/localization_pt_PT.ts \
localization/localization_tr_TR.ts \
localization/localization_nb_NO.ts

system($$QMAKE_LUPDATE -locations absolute ./src ./main -ts localization/*.ts)
22 changes: 0 additions & 22 deletions resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,6 @@
<file>artwork/icon.ico</file>
<file>artwork/icon.png</file>
<file>artwork/icon.svg</file>
<file>localization/localization_ar_MA.qm</file>
<file>localization/localization_ca.qm</file>
<file>localization/localization_de_DE.qm</file>
<file>localization/localization_es_ES.qm</file>
<file>localization/localization_gl_ES.qm</file>
<file>localization/localization_hu_HU.qm</file>
<file>localization/localization_nl_BE.qm</file>
<file>localization/localization_nl_NL.qm</file>
<file>localization/localization_sv_SE.qm</file>
<file>localization/localization_pl_PL.qm</file>
<file>localization/localization_ru_RU.qm</file>
<file>localization/localization_zh_CN.qm</file>
<file>localization/localization_he_IL.qm</file>
<file>localization/localization_cs_CZ.qm</file>
<file>localization/localization_fr_FR.qm</file>
<file>localization/localization_en_GB.qm</file>
<file>localization/localization_en_US.qm</file>
<file>localization/localization_pt_PT.qm</file>
<file>localization/localization_it_IT.qm</file>
<file>localization/localization_sq_AL.qm</file>
<file>localization/localization_nb_NO.qm</file>
<file>localization/localization_tr_TR.qm</file>
</qresource>
<qresource prefix="/icons">
<file alias="document-new.svg">icons/document-new.svg</file>
Expand Down
Loading