summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qtpass.pro91
-rwxr-xr-xrelease-mac2
-rw-r--r--src/src.pro91
-rw-r--r--tests/auto/util/tst_util.cpp2
4 files changed, 93 insertions, 93 deletions
diff --git a/qtpass.pro b/qtpass.pro
index e5aaa7e0..bb0f73d1 100644
--- a/qtpass.pro
+++ b/qtpass.pro
@@ -6,96 +6,6 @@ CONFIG(debug, debug|release) {
SUBDIRS += tests
}
-TRANSLATIONS += localization/localization_nl_NL.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_nl_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
-
-CODECFORSRC = UTF-8
-CODECFORTR = UTF-8
-
-isEmpty(QMAKE_LRELEASE) {
- win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
- else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
- unix {
- !exists($$QMAKE_LRELEASE) {
- greaterThan(QT_MAJOR_VERSION, 4) {
- QMAKE_LRELEASE = lrelease-qt5
- } else {
- QMAKE_LRELEASE = lrelease-qt4
- }
- }
- } else {
- !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
- }
-}
-
-isEmpty(QMAKE_LUPDATE) {
- win32|os2:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]\\lupdate.exe
- else:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate
- unix {
- !exists($$QMAKE_LUPDATE) {
- greaterThan(QT_MAJOR_VERSION, 4) {
- QMAKE_LUPDATE = lupdate-qt5
- } else {
- QMAKE_LUPDATE = lupdate-qt4
- }
- }
- } else {
- !exists($$QMAKE_LUPDATE) { QMAKE_LUPDATE = lupdate }
- }
-}
-
-updateqm.input = TRANSLATIONS
-updateqm.output = localization/${QMAKE_FILE_BASE}.qm
-updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm localization/${QMAKE_FILE_BASE}.qm
-updateqm.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += updateqm
-PRE_TARGETDEPS += compiler_updateqm_make_all
-
-win32 {
- system($$QMAKE_LUPDATE qtpass.pro)
- system($$QMAKE_LRELEASE qtpass.pro)
-} else {
- system($$QMAKE_LUPDATE $$_PRO_FILE_)
- system($$QMAKE_LRELEASE $$_PRO_FILE_)
-}
-
-RESOURCES += resources.qrc
-
-win32 {
- RC_FILE = windows.rc
- static {
- QMAKE_LFLAGS += -static-libgcc -static-libstdc++
- }
- gcc:QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat
- msvc:QMAKE_LFLAGS += /DYNAMICBASE /NXCOMPAT
- LIBS += -lmpr
-} else:macx {
- ICON = artwork/icon.icns
- QMAKE_INFO_PLIST = qtpass.plist
- #QMAKE_POST_LINK = cp -r $$PWD/icons $$OUT_PWD/QtPass.app/Contents/MacOS
-} else:bsd {
- LIBS += -L/usr/local/lib
-}
OTHER_FILES += LICENSE \
README.md \
qtpass.1
@@ -111,7 +21,6 @@ target.path = $$PREFIX/bin/
INSTALLS += target
-
DISTFILES += \
settingsToDelete.txt
diff --git a/release-mac b/release-mac
index c0b1ac71..7266eed5 100755
--- a/release-mac
+++ b/release-mac
@@ -4,4 +4,4 @@ sed 's/CHANGELOG\.md/https:\/\/qtpass.org\/docs\/md__c_h_a_n_g_e_l_o_g.html/' <
sed 's/\[\!.*//' < README.changelog > README.clean
pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean FAQ.md CONTRIBUTING.md CHANGELOG.md
doxygen
-qmake CONFIG+=release && make && macdeployqt QtPass.app && appdmg appdmg.json QtPass.dmg
+qmake CONFIG+=release && make && macdeployqt src/QtPass.app && appdmg appdmg.json src/QtPass.dmg
diff --git a/src/src.pro b/src/src.pro
index daf5fe62..0835d301 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -72,3 +72,94 @@ nosingleapp {
}
DEFINES += "VERSION=\"\\\"$$VERSION\\\"\""
+
+
+TRANSLATIONS += ../localization/localization_nl_NL.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_nl_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
+
+CODECFORSRC = UTF-8
+CODECFORTR = UTF-8
+
+isEmpty(QMAKE_LRELEASE) {
+ win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+ else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+ unix {
+ !exists($$QMAKE_LRELEASE) {
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ QMAKE_LRELEASE = lrelease-qt5
+ } else {
+ QMAKE_LRELEASE = lrelease-qt4
+ }
+ }
+ } else {
+ !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+ }
+}
+
+isEmpty(QMAKE_LUPDATE) {
+ win32|os2:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]\\lupdate.exe
+ else:QMAKE_LUPDATE = $$[QT_INSTALL_BINS]/lupdate
+ unix {
+ !exists($$QMAKE_LUPDATE) {
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ QMAKE_LUPDATE = lupdate-qt5
+ } else {
+ QMAKE_LUPDATE = lupdate-qt4
+ }
+ }
+ } else {
+ !exists($$QMAKE_LUPDATE) { QMAKE_LUPDATE = lupdate }
+ }
+}
+
+updateqm.input = TRANSLATIONS
+updateqm.output = ../localization/${QMAKE_FILE_BASE}.qm
+updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ../localization/${QMAKE_FILE_BASE}.qm
+updateqm.CONFIG += no_link target_predeps
+QMAKE_EXTRA_COMPILERS += updateqm
+PRE_TARGETDEPS += compiler_updateqm_make_all
+
+win32 {
+ system($$QMAKE_LUPDATE ../qtpass.pro)
+ system($$QMAKE_LRELEASE ../qtpass.pro)
+} else {
+ system($$QMAKE_LUPDATE $$_PRO_FILE_)
+ system($$QMAKE_LRELEASE $$_PRO_FILE_)
+}
+
+RESOURCES += ../resources.qrc
+
+win32 {
+ RC_FILE = ../windows.rc
+ static {
+ QMAKE_LFLAGS += -static-libgcc -static-libstdc++
+ }
+ gcc:QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat
+ msvc:QMAKE_LFLAGS += /DYNAMICBASE /NXCOMPAT
+ LIBS += -lmpr
+} else:macx {
+ ICON = ../artwork/icon.icns
+ QMAKE_INFO_PLIST = ../qtpass.plist
+} else:bsd {
+ LIBS += -L/usr/local/lib
+}
diff --git a/tests/auto/util/tst_util.cpp b/tests/auto/util/tst_util.cpp
index f4829517..9788bddb 100644
--- a/tests/auto/util/tst_util.cpp
+++ b/tests/auto/util/tst_util.cpp
@@ -31,7 +31,7 @@ void tst_util::initTestCase() {}
void tst_util::cleanupTestCase() {}
void tst_util::normalizeFolderPath() {
- // QCOMPARE(Util::normalizeFolderPath("test"), "test/");
+ // QCOMPARE(Util::normalizeFolderPath("test"), "test/");
}
QTEST_MAIN(tst_util)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 18:15:25 +0000