--- datovka.pro | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) --- a/datovka.pro +++ b/datovka.pro @@ -31,7 +31,6 @@ win32 { sufficientQtVersion(5, 3, 3, 2) DEFINES += \ - DEBUG=1 \ VERSION=\\\"$${VERSION}\\\" unix:!macx { @@ -82,11 +81,6 @@ unix:!macx { localisation.files += locale/datovka_cs.qm \ locale/datovka_en.qm - additional.path = "$${TEXT_FILES_INST_DIR}" - additional.files = \ - AUTHORS \ - COPYING - DEFINES += DATADIR=\\\"$$DATADIR\\\" \ PKGDATADIR=\\\"$$PKGDATADIR\\\" \ LOCALE_INST_DIR="\"\\\"$${LOCALE_INST_DIR}\\\"\"" \ @@ -104,17 +98,20 @@ unix:!macx { icon64 \ icon128 \ icon256 \ - localisation \ - additional + localisation } } QMAKE_CXXFLAGS = \ - -g -O0 -std=c++11 \ + -g -std=c++11 $$(CXXFLAGS) \ -Wall -Wextra -pedantic \ - -Wdate-time -Wformat -Werror=format-security \ + -Wformat -Werror=format-security \ -Isrc/views +QMAKE_CFLAGS += \ + -g $$(CFLAGS) \ + -Wall -Wextra -pedantic + INCLUDEPATH += \ src @@ -193,15 +190,8 @@ macx { locale/datovka_en.qm localisation.files += locale/qtbase_cs.qm - additional.path = "Contents/Resources" - additional.files = \ - AUTHORS \ - COPYING \ - ChangeLog - QMAKE_BUNDLE_DATA +=\ - localisation \ - additional + localisation } win32 {