Merge pull request #479 from maciejsszmigiero/build-fixes

Build system related fixes
IJHack · Sep 29, 2019 · 9a06a24 · 9a06a24
2 parents 8f2b87b + 65aa495
commit 9a06a24
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/localization/localization_de_LU.ts b/localization/localization_de_LU.ts
diff --git 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
@@ -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)
 }

diff --git a/qtpass.pro b/qtpass.pro
@@ -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
@@ -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
@@ -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
@@ -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