diff --git a/Tarsnap.pro b/Tarsnap.pro index 09526454..a7ae4d62 100644 --- a/Tarsnap.pro +++ b/Tarsnap.pro @@ -254,7 +254,7 @@ DISTFILES += \ DISTFILES += .clang-format # Handle translations -TRANSLATIONS = resources/translations/tarsnap-gui_en.ts \ +TRANSLATIONS = resources/translations/tarsnap-gui_en.ts \ resources/translations/tarsnap-gui_ro.ts qtPrepareTool(LRELEASE, lrelease) @@ -305,12 +305,12 @@ osx { INFO_PLIST_PATH = $$shell_quote($${OUT_PWD}/$${TARGET}.app/Contents/Info.plist) # Add (empty) version strings to the Info.plist. This will print a warning # if the keys already exist; but it's only a warning, not an error! - QMAKE_POST_LINK += /usr/libexec/PlistBuddy \ + QMAKE_POST_LINK += /usr/libexec/PlistBuddy \ -c \"Merge util/version-blank.plist.in\" $${INFO_PLIST_PATH} ; # Replace those version strings with the real ones. - QMAKE_POST_LINK += /usr/libexec/PlistBuddy \ - -c \"Set :CFBundleVersionString string $${VERSION}\" \ - -c \"Set :CFBundleShortVersionString string $${VERSION}\" \ + QMAKE_POST_LINK += /usr/libexec/PlistBuddy \ + -c \"Set :CFBundleVersionString string $${VERSION}\" \ + -c \"Set :CFBundleShortVersionString string $${VERSION}\" \ $${INFO_PLIST_PATH} ; } @@ -339,7 +339,7 @@ for(D, buildtests) { } test.commands = @echo "Compiling tests..."; \ - for D in $${UNIT_TESTS} $${BUILD_ONLY_TESTS}; do \ + for D in $${UNIT_TESTS} $${BUILD_ONLY_TESTS}; do \ (cd \$\${D} && \${MAKE} -s); \ err=\$\$?; \ if \[ \$\${err} -gt "0" \]; then \ diff --git a/build-flags.pri b/build-flags.pri index 95bfa37a..1af87b80 100644 --- a/build-flags.pri +++ b/build-flags.pri @@ -6,12 +6,12 @@ if(checkVersionAtLeast(5,8)) { QMAKE_CXXFLAGS += -isystem $$shell_quote($$[QT_INSTALL_HEADERS]) for(module, QT) { equals(module, "testlib") { - QMAKE_CXXFLAGS += \ + QMAKE_CXXFLAGS += \ -isystem $$shell_quote($$[QT_INSTALL_HEADERS]/QtTest) } else { # Capitalize a first letter, result: -isystem .../include/QtCore moduleList = $$split(module, ) - QMAKE_CXXFLAGS += \ + QMAKE_CXXFLAGS += \ -isystem $$shell_quote($$[QT_INSTALL_HEADERS]/Qt$$upper(\ $$take_first(moduleList))$$join(moduleList, )) } diff --git a/tests/app-cmdline/test-app-cmdline.pro b/tests/app-cmdline/test-app-cmdline.pro index 1e4b782d..165da929 100644 --- a/tests/app-cmdline/test-app-cmdline.pro +++ b/tests/app-cmdline/test-app-cmdline.pro @@ -62,7 +62,7 @@ HEADERS += \ RESOURCES += ../../resources/resources-lite.qrc -TRANSLATIONS = resources/translations/tarsnap-gui_en.ts \ +TRANSLATIONS = resources/translations/tarsnap-gui_en.ts \ resources/translations/tarsnap-gui_ro.ts include(../tests-include.pri) diff --git a/tests/app-setup/test-app-setup.pro b/tests/app-setup/test-app-setup.pro index fb730c1c..e660eeb2 100644 --- a/tests/app-setup/test-app-setup.pro +++ b/tests/app-setup/test-app-setup.pro @@ -123,9 +123,9 @@ HEADERS += \ RESOURCES += \ ../../lib/resources/lib-resources.qrc \ - ../../resources/resources.qrc + ../../resources/resources.qrc -TRANSLATIONS = resources/translations/tarsnap-gui_en.ts \ +TRANSLATIONS = resources/translations/tarsnap-gui_en.ts \ resources/translations/tarsnap-gui_ro.ts include(../tests-include.pri) diff --git a/tests/cli/Tarsnap.pro b/tests/cli/Tarsnap.pro index f7319145..21e8d7a4 100644 --- a/tests/cli/Tarsnap.pro +++ b/tests/cli/Tarsnap.pro @@ -87,7 +87,7 @@ HEADERS += \ RESOURCES += ../../resources/resources-lite.qrc -TRANSLATIONS = resources/translations/tarsnap-gui_en.ts \ +TRANSLATIONS = resources/translations/tarsnap-gui_en.ts \ resources/translations/tarsnap-gui_ro.ts diff --git a/tests/customfilesystemmodel/README.md b/tests/customfilesystemmodel/README.md index 0ce81c5d..2fbe57e5 100644 --- a/tests/customfilesystemmodel/README.md +++ b/tests/customfilesystemmodel/README.md @@ -15,4 +15,3 @@ each file contains: unchecked, `1` partially checked, or `2` checked? For now, the number of tests must be defined in `scenario-num.h`. - diff --git a/tests/jobstabwidget/.gitignore b/tests/jobstabwidget/.gitignore index 3a431d65..cef39419 100644 --- a/tests/jobstabwidget/.gitignore +++ b/tests/jobstabwidget/.gitignore @@ -1,3 +1,2 @@ test-jobstabwidget test-jobstabwidget.app - diff --git a/tests/settingswidget/.gitignore b/tests/settingswidget/.gitignore index bea52026..b28a8a1e 100644 --- a/tests/settingswidget/.gitignore +++ b/tests/settingswidget/.gitignore @@ -1,3 +1,2 @@ test-settingswidget test-settingswidget.app -