diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2019-09-29 22:08:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-29 22:08:13 +0200 |
| commit | 9a06a2485e4fa1dd26cabdb507617f764ba5f10d (patch) | |
| tree | 6766fbc8836552512850b38d3f7434df1d7b17c9 | |
| parent | 8f2b87b36bd74f1c104653bf22150185125c365c (diff) | |
| parent | 65aa4957ad0167880ef990bb355b8bdcd2875b7d (diff) | |
Merge pull request #479 from maciejsszmigiero/build-fixes
Build system related fixes
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | localization/localization_de_DE.ts | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | localization/localization_de_LU.ts | 0 | ||||
| -rw-r--r-- | main/main.cpp | 3 | ||||
| -rw-r--r-- | main/main.pro | 4 | ||||
| -rw-r--r-- | qtpass.pro | 5 | ||||
| -rw-r--r-- | src/src.pro | 1 | ||||
| -rw-r--r-- | tests/auto/ui/ui.pro | 1 | ||||
| -rw-r--r-- | tests/auto/util/util.pro | 1 |
9 files changed, 10 insertions, 7 deletions
@@ -23,10 +23,12 @@ src/libqtpass.a src/moc_predefs.h tests/auto/ui/moc_predefs.h tests/auto/ui/target_wrapper.sh +tests/auto/ui/tst_ui tests/auto/ui/tst_ui.app/ tests/auto/ui/tst_ui.moc tests/auto/util/moc_predefs.h tests/auto/util/target_wrapper.sh +tests/auto/util/tst_util tests/auto/util/tst_util.app/ tests/auto/util/tst_util.moc **/*.gc* diff --git a/localization/localization_de_DE.ts b/localization/localization_de_DE.ts index 5e67a0f5..5e67a0f5 100755..100644 --- a/localization/localization_de_DE.ts +++ b/localization/localization_de_DE.ts diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts index 041a5008..041a5008 100755..100644 --- a/localization/localization_de_LU.ts +++ b/localization/localization_de_LU.ts diff --git a/main/main.cpp b/main/main.cpp index 907aa9e2..c5688537 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -4,6 +4,7 @@ #endif #include <QApplication> +#include <QDir> #include <QTranslator> /*! \mainpage QtPass @@ -67,6 +68,8 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); #endif + Q_INIT_RESOURCE(resources); + QCoreApplication::setOrganizationName("IJHack"); QCoreApplication::setOrganizationDomain("ijhack.org"); QCoreApplication::setApplicationName("QtPass"); diff --git a/main/main.pro b/main/main.pro index 515dfcf9..619b6bcc 100644 --- a/main/main.pro +++ b/main/main.pro @@ -5,6 +5,8 @@ QT += core gui CONFIG += c++11 LIBS = -L"$$OUT_PWD/../src/$(OBJECTS_DIR)" -lqtpass $$LIBS +clang|gcc:PRE_TARGETDEPS += "$$OUT_PWD/../src/$(OBJECTS_DIR)/libqtpass.a" + INCLUDEPATH += ../src macx { @@ -15,8 +17,6 @@ macx { SOURCES += main.cpp -RESOURCES += ../resources.qrc - isEmpty(PREFIX) { PREFIX = $$(PREFIX) } @@ -9,8 +9,6 @@ OTHER_FILES += LICENSE \ README.md \ qtpass.1 -RESOURCES += resources.qrc - # add Makefile target to generate code coverage using gcov gcov.target = gcov gcov.commands += cd src/$$OBJECTS_DIR && gcov "*.gcda" 1>/dev/null $$escape_expand(\\n\\t) @@ -58,8 +56,7 @@ CONFIG(coverage) { QMAKE_DISTCLEAN += -r src/$$OBJECTS_DIR/lcov/ } -TRANSLATIONS += localization/localization_nl.ts \ - localization/localization_ca.ts \ +TRANSLATIONS += localization/localization_ca.ts \ localization/localization_de_DE.ts \ localization/localization_es_ES.ts \ localization/localization_gl_ES.ts \ diff --git a/src/src.pro b/src/src.pro index 8f364004..6c603fbd 100644 --- a/src/src.pro +++ b/src/src.pro @@ -90,7 +90,6 @@ 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 !nosingleapp { SOURCES += singleapplication.cpp diff --git a/tests/auto/ui/ui.pro b/tests/auto/ui/ui.pro index a7324599..7949d49a 100644 --- a/tests/auto/ui/ui.pro +++ b/tests/auto/ui/ui.pro @@ -3,6 +3,7 @@ SOURCES += tst_ui.cpp LIBS = -L"$$OUT_PWD/../../../src/$(OBJECTS_DIR)" -lqtpass $$LIBS +clang|gcc:PRE_TARGETDEPS += "$$OUT_PWD/../../../src/$(OBJECTS_DIR)/libqtpass.a" HEADERS += passworddialog.h \ passwordconfiguration.h diff --git a/tests/auto/util/util.pro b/tests/auto/util/util.pro index 89aa15be..41fd89cb 100644 --- a/tests/auto/util/util.pro +++ b/tests/auto/util/util.pro @@ -3,6 +3,7 @@ SOURCES += tst_util.cpp \ LIBS = -L"$$OUT_PWD/../../../src/$(OBJECTS_DIR)" -lqtpass $$LIBS +clang|gcc:PRE_TARGETDEPS += "$$OUT_PWD/../../../src/$(OBJECTS_DIR)/libqtpass.a" HEADERS += util.h \ filecontent.h |