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

Build system related fixes #479

Merged
merged 6 commits into from
Sep 29, 2019
Merged

Build system related fixes #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4dc6d9c
Unmark localization/*.ts files executable
maciejsszmigiero Sep 28, 2019
fc83098
Remove localization/localization_nl.ts from qtpass.pro, too
maciejsszmigiero Sep 28, 2019
2f415d2
Add tests/auto/ui/tst_ui and tests/auto/util/tst_util to .gitignore
maciejsszmigiero Sep 28, 2019
ca76b9b
Remove compiler_updateqm_make_all target from PRE_TARGETDEPS in src.pro
maciejsszmigiero Sep 28, 2019
fd1369d
Make sure main/qtpass actually depends on libqtpass.a
maciejsszmigiero Sep 28, 2019
65aa495
Make sure resources are built just once
maciejsszmigiero Sep 29, 2019
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand Down
Empty file modified localization/localization_de_DE.ts
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified localization/localization_de_LU.ts
100755 → 100644
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions main/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#endif

#include <QApplication>
#include <QDir>
#include <QTranslator>

/*! \mainpage QtPass
Expand Down Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions main/main.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -15,8 +17,6 @@ macx {

SOURCES += main.cpp

RESOURCES += ../resources.qrc

isEmpty(PREFIX) {
PREFIX = $$(PREFIX)
}
Expand Down
5 changes: 1 addition & 4 deletions qtpass.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion src/src.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/auto/ui/ui.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/auto/util/util.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down