From 1ece5b40a7adae8bb4444b05cee639252d71a925 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Tue, 5 Dec 2023 11:34:16 -0800 Subject: [PATCH] build: align \ on column 72 This puts the line continuations \ on the 9th tab stop. --- Tarsnap.pro | 558 +++++++++--------- build-flags.pri | 4 +- lib/plugins/plugins.pro | 100 ++-- tests/app-cmdline/test-app-cmdline.pro | 100 ++-- tests/app-setup/test-app-setup.pro | 222 +++---- .../test-archivestabwidget.pro | 88 +-- .../backuptabwidget/test-backuptabwidget.pro | 90 +-- tests/cli/Tarsnap.pro | 144 ++--- tests/consolelog/test-consolelog.pro | 8 +- tests/core/test-core.pro | 6 +- tests/customfilesystemmodel/test-cfsm.pro | 10 +- tests/helpwidget/test-helpwidget.pro | 28 +- tests/jobstabwidget/test-jobstabwidget.pro | 116 ++-- tests/lib-widgets/test-lib-widgets.pro | 60 +- tests/mainwindow/test-mainwindow.pro | 264 ++++----- tests/persistent/test-persistent.pro | 32 +- tests/settingswidget/test-settingswidget.pro | 52 +- tests/setupwizard/test-setupwizard.pro | 96 +-- tests/small-widgets/test-small-widgets.pro | 40 +- tests/task/test-task.pro | 26 +- tests/taskmanager/test-taskmanager.pro | 102 ++-- tests/tests-include.pri | 16 +- tests/translations/test-translations.pro | 32 +- 23 files changed, 1097 insertions(+), 1097 deletions(-) diff --git a/Tarsnap.pro b/Tarsnap.pro index 0ea66882..09526454 100644 --- a/Tarsnap.pro +++ b/Tarsnap.pro @@ -22,239 +22,239 @@ include(build-flags.pri) #QMAKE_TARGET_DESCRIPTION = GUI frontend for Tarsnap #QMAKE_TARGET_COPYRIGHT = copyright Tarsnap Backup Inc. -SOURCES += \ - lib/core/ConsoleLog.cpp \ - lib/core/TSettings.cpp \ - lib/util/optparse.c \ - lib/util/optparse_helper.c \ - lib/widgets/TAsideLabel.cpp \ - lib/widgets/TBusyLabel.cpp \ - lib/widgets/TElidedLabel.cpp \ - lib/widgets/TOkLabel.cpp \ - lib/widgets/TPathComboBrowse.cpp \ - lib/widgets/TPathLineBrowse.cpp \ - lib/widgets/TPopupPushButton.cpp \ - lib/widgets/TProgressWidget.cpp \ - lib/widgets/TTabWidget.cpp \ - lib/widgets/TTextView.cpp \ - lib/widgets/TWizard.cpp \ - lib/widgets/TWizardPage.cpp \ - libcperciva/util/getopt.c \ - libcperciva/util/warnp.c \ - src/app-cmdline.cpp \ - src/app-gui.cpp \ - src/app-setup.cpp \ - src/backenddata.cpp \ - src/backuptask.cpp \ - src/basetask.cpp \ - src/cmdlinetask.cpp \ - src/customfilesystemmodel.cpp \ - src/dir-utils.cpp \ - src/dirinfotask.cpp \ - src/filetablemodel.cpp \ - src/humanbytes.cpp \ - src/init-shared.cpp \ - src/jobrunner.cpp \ - src/main.cpp \ - src/notification.cpp \ - src/parsearchivelistingtask.cpp \ - src/persistentmodel/archive.cpp \ - src/persistentmodel/job.cpp \ - src/persistentmodel/journal.cpp \ - src/persistentmodel/persistentobject.cpp \ - src/persistentmodel/persistentstore.cpp \ - src/persistentmodel/upgrade-store.cpp \ - src/scheduling.cpp \ - src/setupwizard/setupwizard.cpp \ - src/setupwizard/setupwizard_cli.cpp \ - src/setupwizard/setupwizard_final.cpp \ - src/setupwizard/setupwizard_intro.cpp \ - src/setupwizard/setupwizard_register.cpp \ - src/tarsnapaccount.cpp \ - src/taskmanager.cpp \ - src/taskqueuer.cpp \ - src/tasks/tasks-misc.cpp \ - src/tasks/tasks-setup.cpp \ - src/tasks/tasks-tarsnap.cpp \ - src/tasks/tasks-utils.cpp \ - src/translator.cpp \ - src/widgets/aboutdialog.cpp \ - src/widgets/archivelistwidget.cpp \ - src/widgets/archivelistwidgetitem.cpp \ - src/widgets/archivestabwidget.cpp \ - src/widgets/archivewidget.cpp \ - src/widgets/backuplistwidget.cpp \ - src/widgets/backuplistwidgetitem.cpp \ - src/widgets/backuptabwidget.cpp \ - src/widgets/confirmationdialog.cpp \ - src/widgets/consolelogdialog.cpp \ - src/widgets/elidedannotatedlabel.cpp \ - src/widgets/elidedclickablelabel.cpp \ - src/widgets/filepickerdialog.cpp \ - src/widgets/filepickerwidget.cpp \ - src/widgets/helpwidget.cpp \ - src/widgets/joblistwidget.cpp \ - src/widgets/joblistwidgetitem.cpp \ - src/widgets/jobstabwidget.cpp \ - src/widgets/jobwidget.cpp \ - src/widgets/mainwindow.cpp \ - src/widgets/restoredialog.cpp \ - src/widgets/schedulingwidgets.cpp \ - src/widgets/settingswidget.cpp \ - src/widgets/statisticsdialog.cpp \ - src/widgets/statusbarwidget.cpp \ - src/widgets/stoptasksdialog.cpp \ +SOURCES += \ + lib/core/ConsoleLog.cpp \ + lib/core/TSettings.cpp \ + lib/util/optparse.c \ + lib/util/optparse_helper.c \ + lib/widgets/TAsideLabel.cpp \ + lib/widgets/TBusyLabel.cpp \ + lib/widgets/TElidedLabel.cpp \ + lib/widgets/TOkLabel.cpp \ + lib/widgets/TPathComboBrowse.cpp \ + lib/widgets/TPathLineBrowse.cpp \ + lib/widgets/TPopupPushButton.cpp \ + lib/widgets/TProgressWidget.cpp \ + lib/widgets/TTabWidget.cpp \ + lib/widgets/TTextView.cpp \ + lib/widgets/TWizard.cpp \ + lib/widgets/TWizardPage.cpp \ + libcperciva/util/getopt.c \ + libcperciva/util/warnp.c \ + src/app-cmdline.cpp \ + src/app-gui.cpp \ + src/app-setup.cpp \ + src/backenddata.cpp \ + src/backuptask.cpp \ + src/basetask.cpp \ + src/cmdlinetask.cpp \ + src/customfilesystemmodel.cpp \ + src/dir-utils.cpp \ + src/dirinfotask.cpp \ + src/filetablemodel.cpp \ + src/humanbytes.cpp \ + src/init-shared.cpp \ + src/jobrunner.cpp \ + src/main.cpp \ + src/notification.cpp \ + src/parsearchivelistingtask.cpp \ + src/persistentmodel/archive.cpp \ + src/persistentmodel/job.cpp \ + src/persistentmodel/journal.cpp \ + src/persistentmodel/persistentobject.cpp \ + src/persistentmodel/persistentstore.cpp \ + src/persistentmodel/upgrade-store.cpp \ + src/scheduling.cpp \ + src/setupwizard/setupwizard.cpp \ + src/setupwizard/setupwizard_cli.cpp \ + src/setupwizard/setupwizard_final.cpp \ + src/setupwizard/setupwizard_intro.cpp \ + src/setupwizard/setupwizard_register.cpp \ + src/tarsnapaccount.cpp \ + src/taskmanager.cpp \ + src/taskqueuer.cpp \ + src/tasks/tasks-misc.cpp \ + src/tasks/tasks-setup.cpp \ + src/tasks/tasks-tarsnap.cpp \ + src/tasks/tasks-utils.cpp \ + src/translator.cpp \ + src/widgets/aboutdialog.cpp \ + src/widgets/archivelistwidget.cpp \ + src/widgets/archivelistwidgetitem.cpp \ + src/widgets/archivestabwidget.cpp \ + src/widgets/archivewidget.cpp \ + src/widgets/backuplistwidget.cpp \ + src/widgets/backuplistwidgetitem.cpp \ + src/widgets/backuptabwidget.cpp \ + src/widgets/confirmationdialog.cpp \ + src/widgets/consolelogdialog.cpp \ + src/widgets/elidedannotatedlabel.cpp \ + src/widgets/elidedclickablelabel.cpp \ + src/widgets/filepickerdialog.cpp \ + src/widgets/filepickerwidget.cpp \ + src/widgets/helpwidget.cpp \ + src/widgets/joblistwidget.cpp \ + src/widgets/joblistwidgetitem.cpp \ + src/widgets/jobstabwidget.cpp \ + src/widgets/jobwidget.cpp \ + src/widgets/mainwindow.cpp \ + src/widgets/restoredialog.cpp \ + src/widgets/schedulingwidgets.cpp \ + src/widgets/settingswidget.cpp \ + src/widgets/statisticsdialog.cpp \ + src/widgets/statusbarwidget.cpp \ + src/widgets/stoptasksdialog.cpp \ src/widgets/tarsnapaccountdialog.cpp -HEADERS += \ - lib/core/ConsoleLog.h \ - lib/core/LogEntry.h \ - lib/core/TSettings.h \ - lib/core/warnings-disable.h \ - lib/util/optparse.h \ - lib/util/optparse_helper.h \ - lib/widgets/TAsideLabel.h \ - lib/widgets/TBusyLabel.h \ - lib/widgets/TElidedLabel.h \ - lib/widgets/TOkLabel.h \ - lib/widgets/TPathComboBrowse.h \ - lib/widgets/TPathLineBrowse.h \ - lib/widgets/TPopupPushButton.h \ - lib/widgets/TProgressWidget.h \ - lib/widgets/TTabWidget.h \ - lib/widgets/TTextView.h \ - lib/widgets/TWizard.h \ - lib/widgets/TWizardPage.h \ - libcperciva/util/getopt.h \ - libcperciva/util/warnp.h \ - src/app-cmdline.h \ - src/app-gui.h \ - src/app-setup.h \ - src/backenddata.h \ - src/backuptask.h \ - src/basetask.h \ - src/compat.h \ - src/cmdlinetask.h \ - src/customfilesystemmodel.h \ - src/debug.h \ - src/dir-utils.h \ - src/dirinfotask.h \ - src/filetablemodel.h \ - src/humanbytes.h \ - src/init-shared.h \ - src/jobrunner.h \ - src/messages/archivefilestat.h \ - src/messages/archiveptr.h \ - src/messages/archiverestoreoptions.h \ - src/messages/backuptaskdataptr.h \ - src/messages/jobptr.h \ - src/messages/notification_info.h \ - src/messages/tarsnaperror.h \ - src/messages/taskstatus.h \ - src/notification.h \ - src/parsearchivelistingtask.h \ - src/persistentmodel/archive.h \ - src/persistentmodel/job.h \ - src/persistentmodel/journal.h \ - src/persistentmodel/persistentobject.h \ - src/persistentmodel/persistentstore.h \ - src/persistentmodel/upgrade-store.h \ - src/scheduling.h \ - src/setupwizard/setupwizard.h \ - src/setupwizard/setupwizard_cli.h \ - src/setupwizard/setupwizard_final.h \ - src/setupwizard/setupwizard_intro.h \ - src/setupwizard/setupwizard_register.h \ - src/tarsnapaccount.h \ - src/taskmanager.h \ - src/taskqueuer.h \ - src/tasks/tasks-defs.h \ - src/tasks/tasks-misc.h \ - src/tasks/tasks-setup.h \ - src/tasks/tasks-tarsnap.h \ - src/tasks/tasks-utils.h \ - src/translator.h \ - src/widgets/aboutdialog.h \ - src/widgets/archivelistwidget.h \ - src/widgets/archivelistwidgetitem.h \ - src/widgets/archivestabwidget.h \ - src/widgets/archivewidget.h \ - src/widgets/backuplistwidget.h \ - src/widgets/backuplistwidgetitem.h \ - src/widgets/backuptabwidget.h \ - src/widgets/confirmationdialog.h \ - src/widgets/consolelogdialog.h \ - src/widgets/elidedannotatedlabel.h \ - src/widgets/elidedclickablelabel.h \ - src/widgets/filepickerdialog.h \ - src/widgets/filepickerwidget.h \ - src/widgets/helpwidget.h \ - src/widgets/joblistwidget.h \ - src/widgets/joblistwidgetitem.h \ - src/widgets/jobstabwidget.h \ - src/widgets/jobwidget.h \ - src/widgets/mainwindow.h \ - src/widgets/restoredialog.h \ - src/widgets/schedulingwidgets.h \ - src/widgets/settingswidget.h \ - src/widgets/statisticsdialog.h \ - src/widgets/statusbarwidget.h \ - src/widgets/stoptasksdialog.h \ +HEADERS += \ + lib/core/ConsoleLog.h \ + lib/core/LogEntry.h \ + lib/core/TSettings.h \ + lib/core/warnings-disable.h \ + lib/util/optparse.h \ + lib/util/optparse_helper.h \ + lib/widgets/TAsideLabel.h \ + lib/widgets/TBusyLabel.h \ + lib/widgets/TElidedLabel.h \ + lib/widgets/TOkLabel.h \ + lib/widgets/TPathComboBrowse.h \ + lib/widgets/TPathLineBrowse.h \ + lib/widgets/TPopupPushButton.h \ + lib/widgets/TProgressWidget.h \ + lib/widgets/TTabWidget.h \ + lib/widgets/TTextView.h \ + lib/widgets/TWizard.h \ + lib/widgets/TWizardPage.h \ + libcperciva/util/getopt.h \ + libcperciva/util/warnp.h \ + src/app-cmdline.h \ + src/app-gui.h \ + src/app-setup.h \ + src/backenddata.h \ + src/backuptask.h \ + src/basetask.h \ + src/compat.h \ + src/cmdlinetask.h \ + src/customfilesystemmodel.h \ + src/debug.h \ + src/dir-utils.h \ + src/dirinfotask.h \ + src/filetablemodel.h \ + src/humanbytes.h \ + src/init-shared.h \ + src/jobrunner.h \ + src/messages/archivefilestat.h \ + src/messages/archiveptr.h \ + src/messages/archiverestoreoptions.h \ + src/messages/backuptaskdataptr.h \ + src/messages/jobptr.h \ + src/messages/notification_info.h \ + src/messages/tarsnaperror.h \ + src/messages/taskstatus.h \ + src/notification.h \ + src/parsearchivelistingtask.h \ + src/persistentmodel/archive.h \ + src/persistentmodel/job.h \ + src/persistentmodel/journal.h \ + src/persistentmodel/persistentobject.h \ + src/persistentmodel/persistentstore.h \ + src/persistentmodel/upgrade-store.h \ + src/scheduling.h \ + src/setupwizard/setupwizard.h \ + src/setupwizard/setupwizard_cli.h \ + src/setupwizard/setupwizard_final.h \ + src/setupwizard/setupwizard_intro.h \ + src/setupwizard/setupwizard_register.h \ + src/tarsnapaccount.h \ + src/taskmanager.h \ + src/taskqueuer.h \ + src/tasks/tasks-defs.h \ + src/tasks/tasks-misc.h \ + src/tasks/tasks-setup.h \ + src/tasks/tasks-tarsnap.h \ + src/tasks/tasks-utils.h \ + src/translator.h \ + src/widgets/aboutdialog.h \ + src/widgets/archivelistwidget.h \ + src/widgets/archivelistwidgetitem.h \ + src/widgets/archivestabwidget.h \ + src/widgets/archivewidget.h \ + src/widgets/backuplistwidget.h \ + src/widgets/backuplistwidgetitem.h \ + src/widgets/backuptabwidget.h \ + src/widgets/confirmationdialog.h \ + src/widgets/consolelogdialog.h \ + src/widgets/elidedannotatedlabel.h \ + src/widgets/elidedclickablelabel.h \ + src/widgets/filepickerdialog.h \ + src/widgets/filepickerwidget.h \ + src/widgets/helpwidget.h \ + src/widgets/joblistwidget.h \ + src/widgets/joblistwidgetitem.h \ + src/widgets/jobstabwidget.h \ + src/widgets/jobwidget.h \ + src/widgets/mainwindow.h \ + src/widgets/restoredialog.h \ + src/widgets/schedulingwidgets.h \ + src/widgets/settingswidget.h \ + src/widgets/statisticsdialog.h \ + src/widgets/statusbarwidget.h \ + src/widgets/stoptasksdialog.h \ src/widgets/tarsnapaccountdialog.h -INCLUDEPATH += \ - lib/core/ \ - lib/util/ \ - lib/widgets/ \ - libcperciva/util/ \ +INCLUDEPATH += \ + lib/core/ \ + lib/util/ \ + lib/widgets/ \ + libcperciva/util/ \ src/ -FORMS += \ - forms/aboutdialog.ui \ - forms/archivelistwidgetitem.ui \ - forms/archivestabwidget.ui \ - forms/archivewidget.ui \ - forms/backuplistwidgetitem.ui \ - forms/backuptabwidget.ui \ - forms/consolelogdialog.ui \ - forms/filepickerdialog.ui \ - forms/filepickerwidget.ui \ - forms/helpwidget.ui \ - forms/joblistwidgetitem.ui \ - forms/jobstabwidget.ui \ - forms/jobwidget.ui \ - forms/logindialog.ui \ - forms/mainwindow.ui \ - forms/restoredialog.ui \ - forms/settingswidget.ui \ - forms/setupwizard.ui \ - forms/setupwizard_cli.ui \ - forms/setupwizard_final.ui \ - forms/setupwizard_intro.ui \ - forms/setupwizard_register.ui \ - forms/statisticsdialog.ui \ - forms/statusbarwidget.ui \ - forms/stoptasksdialog.ui \ - lib/forms/TPathComboBrowse.ui \ - lib/forms/TPathLineBrowse.ui \ - lib/forms/TProgressWidget.ui \ - lib/forms/TTabWidget.ui \ +FORMS += \ + forms/aboutdialog.ui \ + forms/archivelistwidgetitem.ui \ + forms/archivestabwidget.ui \ + forms/archivewidget.ui \ + forms/backuplistwidgetitem.ui \ + forms/backuptabwidget.ui \ + forms/consolelogdialog.ui \ + forms/filepickerdialog.ui \ + forms/filepickerwidget.ui \ + forms/helpwidget.ui \ + forms/joblistwidgetitem.ui \ + forms/jobstabwidget.ui \ + forms/jobwidget.ui \ + forms/logindialog.ui \ + forms/mainwindow.ui \ + forms/restoredialog.ui \ + forms/settingswidget.ui \ + forms/setupwizard.ui \ + forms/setupwizard_cli.ui \ + forms/setupwizard_final.ui \ + forms/setupwizard_intro.ui \ + forms/setupwizard_register.ui \ + forms/statisticsdialog.ui \ + forms/statusbarwidget.ui \ + forms/stoptasksdialog.ui \ + lib/forms/TPathComboBrowse.ui \ + lib/forms/TPathLineBrowse.ui \ + lib/forms/TProgressWidget.ui \ + lib/forms/TTabWidget.ui \ lib/forms/TWizard.ui -RESOURCES += \ - lib/resources/lib-resources.qrc \ +RESOURCES += \ + lib/resources/lib-resources.qrc \ resources/resources.qrc -DISTFILES += \ - CHANGELOG \ - COPYING \ - INSTALL \ +DISTFILES += \ + CHANGELOG \ + COPYING \ + INSTALL \ README 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) @@ -274,24 +274,24 @@ OBJECTS_DIR = build/gui/ # Start off with tests which require the most compilation units, in order # to maximize the benefits of parallel builds. -UNIT_TESTS = \ - tests/mainwindow \ - tests/app-cmdline \ - tests/app-setup \ - tests/translations \ - tests/jobstabwidget \ - tests/settingswidget \ - tests/backuptabwidget \ - tests/archivestabwidget \ - tests/helpwidget \ - tests/persistent \ - tests/setupwizard \ - tests/taskmanager \ - tests/customfilesystemmodel \ - tests/small-widgets \ - tests/lib-widgets \ - tests/consolelog \ - tests/task \ +UNIT_TESTS = \ + tests/mainwindow \ + tests/app-cmdline \ + tests/app-setup \ + tests/translations \ + tests/jobstabwidget \ + tests/settingswidget \ + tests/backuptabwidget \ + tests/archivestabwidget \ + tests/helpwidget \ + tests/persistent \ + tests/setupwizard \ + tests/taskmanager \ + tests/customfilesystemmodel \ + tests/small-widgets \ + tests/lib-widgets \ + tests/consolelog \ + tests/task \ tests/core OPTIONAL_BUILD_ONLY_TESTS = tests/cli @@ -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} ; } @@ -327,63 +327,63 @@ test_home_prep.commands = @rm -rf "$${TEST_HOME}" # Prep the tests buildtests = $$UNIT_TESTS $$BUILD_ONLY_TESTS for(D, buildtests) { - cmd= cd $${D} && \ - CFLAGS=\"$$(CFLAGS)\" \ - CXXFLAGS=\"$$(CXXFLAGS)\" \ - LDFLAGS=\"$$(LDFLAGS)\" \ - QMAKE_CC=\"$${QMAKE_CC}\" \ - QMAKE_CXX=\"$${QMAKE_CXX}\" \ - QMAKE_LINK=\"$${QMAKE_LINK}\" \ + cmd= cd $${D} && \ + CFLAGS=\"$$(CFLAGS)\" \ + CXXFLAGS=\"$$(CXXFLAGS)\" \ + LDFLAGS=\"$$(LDFLAGS)\" \ + QMAKE_CC=\"$${QMAKE_CC}\" \ + QMAKE_CXX=\"$${QMAKE_CXX}\" \ + QMAKE_LINK=\"$${QMAKE_LINK}\" \ $${QMAKE_QMAKE} -spec $${QMAKESPEC} system($$cmd)|error("Failed to qmake in: $$D") } -test.commands = @echo "Compiling tests..."; \ - for D in $${UNIT_TESTS} $${BUILD_ONLY_TESTS}; do \ - (cd \$\${D} && \${MAKE} -s); \ - err=\$\$?; \ - if \[ \$\${err} -gt "0" \]; then \ - exit \$\${err}; \ - fi; \ - done; \ - echo "Running tests..."; \ - for D in $${UNIT_TESTS}; do \ - (cd \$\${D} && \${MAKE} test -s); \ - err=\$\$?; \ - if \[ \$\${err} -gt "0" \]; then \ - exit \$\${err}; \ - fi; \ +test.commands = @echo "Compiling tests..."; \ + for D in $${UNIT_TESTS} $${BUILD_ONLY_TESTS}; do \ + (cd \$\${D} && \${MAKE} -s); \ + err=\$\$?; \ + if \[ \$\${err} -gt "0" \]; then \ + exit \$\${err}; \ + fi; \ + done; \ + echo "Running tests..."; \ + for D in $${UNIT_TESTS}; do \ + (cd \$\${D} && \${MAKE} test -s); \ + err=\$\$?; \ + if \[ \$\${err} -gt "0" \]; then \ + exit \$\${err}; \ + fi; \ done test.depends = test_home_prep # Prep the optional tests optional_buildtests = $$OPTIONAL_BUILD_ONLY_TESTS for(D, optional_buildtests) { - cmd= cd $${D} && \ - CFLAGS=\"$$(CFLAGS)\" \ - CXXFLAGS=\"$$(CXXFLAGS)\" \ - LDFLAGS=\"$$(LDFLAGS)\" \ - QMAKE_CC=\"$${QMAKE_CC}\" \ - QMAKE_CXX=\"$${QMAKE_CXX}\" \ - QMAKE_LINK=\"$${QMAKE_LINK}\" \ + cmd= cd $${D} && \ + CFLAGS=\"$$(CFLAGS)\" \ + CXXFLAGS=\"$$(CXXFLAGS)\" \ + LDFLAGS=\"$$(LDFLAGS)\" \ + QMAKE_CC=\"$${QMAKE_CC}\" \ + QMAKE_CXX=\"$${QMAKE_CXX}\" \ + QMAKE_LINK=\"$${QMAKE_LINK}\" \ $${QMAKE_QMAKE} -spec $${QMAKESPEC} system($$cmd)|error("Failed to qmake in: $$D") } optional_buildtest.commands = @echo "Compiling optional tests..."; \ - for D in $${OPTIONAL_BUILD_ONLY_TESTS}; do \ - (cd \$\${D} && \${MAKE} -s); \ - err=\$\$?; \ - if \[ \$\${err} -gt "0" \]; then \ - exit \$\${err}; \ - fi; \ - done; \ + for D in $${OPTIONAL_BUILD_ONLY_TESTS}; do \ + (cd \$\${D} && \${MAKE} -s); \ + err=\$\$?; \ + if \[ \$\${err} -gt "0" \]; then \ + exit \$\${err}; \ + fi; \ + done; \ # Yes, this also does distclean -test_clean.commands = \ +test_clean.commands = \ for D in $${UNIT_TESTS} $${OPTIONAL_BUILD_ONLY_TESTS}; do \ - (cd \$\${D} && \${QMAKE} && \ - \${MAKE} distclean); \ + (cd \$\${D} && \${QMAKE} && \ + \${MAKE} distclean); \ done clean.depends += test_clean diff --git a/build-flags.pri b/build-flags.pri index 84f8b805..95bfa37a 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/lib/plugins/plugins.pro b/lib/plugins/plugins.pro index 5261de3b..6e344380 100644 --- a/lib/plugins/plugins.pro +++ b/lib/plugins/plugins.pro @@ -3,62 +3,62 @@ CONFIG += plugin TEMPLATE = lib QT += widgets uiplugin -HEADERS = plugins.h \ - ../core/warnings-disable.h \ - ../widgets/TAsideLabel.h \ - ../widgets/TBusyLabel.h \ - ../widgets/TElidedLabel.h \ - ../widgets/TOkLabel.h \ - ../widgets/TPathComboBrowse.h \ - ../widgets/TPathLineBrowse.h \ - ../widgets/TPopupPushButton.h \ - ../widgets/TProgressWidget.h \ - ../widgets/TTabWidget.h \ - ../widgets/TTextView.h \ - ../widgets/TWizardPage.h \ - TAsideLabelPlugin.h \ - TBusyLabelPlugin.h \ - TElidedLabelPlugin.h \ - TOkLabelPlugin.h \ - TPathComboBrowsePlugin.h \ - TPathLineBrowsePlugin.h \ - TPopupPushButtonPlugin.h \ - TProgressWidgetPlugin.h \ - TTabWidgetPlugin.h \ - TTextViewPlugin.h \ +HEADERS = plugins.h \ + ../core/warnings-disable.h \ + ../widgets/TAsideLabel.h \ + ../widgets/TBusyLabel.h \ + ../widgets/TElidedLabel.h \ + ../widgets/TOkLabel.h \ + ../widgets/TPathComboBrowse.h \ + ../widgets/TPathLineBrowse.h \ + ../widgets/TPopupPushButton.h \ + ../widgets/TProgressWidget.h \ + ../widgets/TTabWidget.h \ + ../widgets/TTextView.h \ + ../widgets/TWizardPage.h \ + TAsideLabelPlugin.h \ + TBusyLabelPlugin.h \ + TElidedLabelPlugin.h \ + TOkLabelPlugin.h \ + TPathComboBrowsePlugin.h \ + TPathLineBrowsePlugin.h \ + TPopupPushButtonPlugin.h \ + TProgressWidgetPlugin.h \ + TTabWidgetPlugin.h \ + TTextViewPlugin.h \ TWizardPagePlugin.h -SOURCES = plugins.cpp \ - ../widgets/TAsideLabel.cpp \ - ../widgets/TBusyLabel.cpp \ - ../widgets/TElidedLabel.cpp \ - ../widgets/TOkLabel.cpp \ - ../widgets/TPathComboBrowse.cpp \ - ../widgets/TPathLineBrowse.cpp \ - ../widgets/TPopupPushButton.cpp \ - ../widgets/TProgressWidget.cpp \ - ../widgets/TTabWidget.cpp \ - ../widgets/TTextView.cpp \ - ../widgets/TWizardPage.cpp \ - TAsideLabelPlugin.cpp \ - TBusyLabelPlugin.cpp \ - TElidedLabelPlugin.cpp \ - TOkLabelPlugin.cpp \ - TPathComboBrowsePlugin.cpp \ - TPathLineBrowsePlugin.cpp \ - TPopupPushButtonPlugin.cpp \ - TProgressWidgetPlugin.cpp \ - TTabWidgetPlugin.cpp \ - TTextViewPlugin.cpp \ +SOURCES = plugins.cpp \ + ../widgets/TAsideLabel.cpp \ + ../widgets/TBusyLabel.cpp \ + ../widgets/TElidedLabel.cpp \ + ../widgets/TOkLabel.cpp \ + ../widgets/TPathComboBrowse.cpp \ + ../widgets/TPathLineBrowse.cpp \ + ../widgets/TPopupPushButton.cpp \ + ../widgets/TProgressWidget.cpp \ + ../widgets/TTabWidget.cpp \ + ../widgets/TTextView.cpp \ + ../widgets/TWizardPage.cpp \ + TAsideLabelPlugin.cpp \ + TBusyLabelPlugin.cpp \ + TElidedLabelPlugin.cpp \ + TOkLabelPlugin.cpp \ + TPathComboBrowsePlugin.cpp \ + TPathLineBrowsePlugin.cpp \ + TPopupPushButtonPlugin.cpp \ + TProgressWidgetPlugin.cpp \ + TTabWidgetPlugin.cpp \ + TTextViewPlugin.cpp \ TWizardPagePlugin.cpp -FORMS = \ - ../forms/TPathComboBrowse.ui \ - ../forms/TPathLineBrowse.ui \ - ../forms/TProgressWidget.ui \ +FORMS = \ + ../forms/TPathComboBrowse.ui \ + ../forms/TPathLineBrowse.ui \ + ../forms/TProgressWidget.ui \ ../forms/TTabWidget.ui -RESOURCES += \ +RESOURCES += \ ../resources/lib-resources.qrc target.path = $$[QT_INSTALL_PLUGINS]/designer diff --git a/tests/app-cmdline/test-app-cmdline.pro b/tests/app-cmdline/test-app-cmdline.pro index 559eb813..1e4b782d 100644 --- a/tests/app-cmdline/test-app-cmdline.pro +++ b/tests/app-cmdline/test-app-cmdline.pro @@ -7,62 +7,62 @@ VALGRIND = true VERSION = test DEFINES += APP_VERSION=\\\"$$VERSION\\\" -SOURCES += test-app-cmdline.cpp \ - ../../lib/core/ConsoleLog.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/util/optparse.c \ - ../../lib/util/optparse_helper.c \ - ../../libcperciva/util/getopt.c \ - ../../libcperciva/util/warnp.c \ - ../../src/app-cmdline.cpp \ - ../../src/backuptask.cpp \ - ../../src/basetask.cpp \ - ../../src/init-shared.cpp \ - ../../src/parsearchivelistingtask.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/job.cpp \ - ../../src/persistentmodel/journal.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ - ../../src/persistentmodel/upgrade-store.cpp \ - ../../src/scheduling.cpp \ - ../../src/tasks/tasks-utils.cpp \ +SOURCES += test-app-cmdline.cpp \ + ../../lib/core/ConsoleLog.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/util/optparse.c \ + ../../lib/util/optparse_helper.c \ + ../../libcperciva/util/getopt.c \ + ../../libcperciva/util/warnp.c \ + ../../src/app-cmdline.cpp \ + ../../src/backuptask.cpp \ + ../../src/basetask.cpp \ + ../../src/init-shared.cpp \ + ../../src/parsearchivelistingtask.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/job.cpp \ + ../../src/persistentmodel/journal.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ + ../../src/persistentmodel/upgrade-store.cpp \ + ../../src/scheduling.cpp \ + ../../src/tasks/tasks-utils.cpp \ ../../src/translator.cpp -HEADERS += \ - ../../lib/core/ConsoleLog.h \ - ../../lib/core/LogEntry.h \ - ../../lib/core/TSettings.h \ - ../../lib/util/optparse.h \ - ../../lib/util/optparse_helper.h \ - ../../libcperciva/util/getopt.h \ - ../../libcperciva/util/warnp.h \ - ../../src/app-cmdline.h \ - ../../src/backuptask.h \ - ../../src/basetask.h \ - ../../src/init-shared.h \ - ../../src/messages/archivefilestat.h \ - ../../src/messages/archiveptr.h \ - ../../src/messages/archiverestoreoptions.h \ - ../../src/messages/backuptaskdataptr.h \ - ../../src/messages/jobptr.h \ - ../../src/messages/tarsnaperror.h \ - ../../src/messages/taskstatus.h \ - ../../src/parsearchivelistingtask.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/job.h \ - ../../src/persistentmodel/journal.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ - ../../src/persistentmodel/upgrade-store.h \ - ../../src/scheduling.h \ - ../../src/tasks/tasks-utils.h \ - ../../src/translator.h \ +HEADERS += \ + ../../lib/core/ConsoleLog.h \ + ../../lib/core/LogEntry.h \ + ../../lib/core/TSettings.h \ + ../../lib/util/optparse.h \ + ../../lib/util/optparse_helper.h \ + ../../libcperciva/util/getopt.h \ + ../../libcperciva/util/warnp.h \ + ../../src/app-cmdline.h \ + ../../src/backuptask.h \ + ../../src/basetask.h \ + ../../src/init-shared.h \ + ../../src/messages/archivefilestat.h \ + ../../src/messages/archiveptr.h \ + ../../src/messages/archiverestoreoptions.h \ + ../../src/messages/backuptaskdataptr.h \ + ../../src/messages/jobptr.h \ + ../../src/messages/tarsnaperror.h \ + ../../src/messages/taskstatus.h \ + ../../src/parsearchivelistingtask.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/job.h \ + ../../src/persistentmodel/journal.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ + ../../src/persistentmodel/upgrade-store.h \ + ../../src/scheduling.h \ + ../../src/tasks/tasks-utils.h \ + ../../src/translator.h \ ../qtest-platform.h 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 7ec36c6d..fb730c1c 100644 --- a/tests/app-setup/test-app-setup.pro +++ b/tests/app-setup/test-app-setup.pro @@ -7,125 +7,125 @@ VALGRIND = true VERSION = test DEFINES += APP_VERSION=\\\"$$VERSION\\\" -FORMS += \ - ../../forms/setupwizard_cli.ui \ - ../../forms/setupwizard_final.ui \ - ../../forms/setupwizard_intro.ui \ - ../../forms/setupwizard_register.ui \ - ../../lib/forms/TPathComboBrowse.ui \ - ../../lib/forms/TPathLineBrowse.ui \ - ../../lib/forms/TProgressWidget.ui \ +FORMS += \ + ../../forms/setupwizard_cli.ui \ + ../../forms/setupwizard_final.ui \ + ../../forms/setupwizard_intro.ui \ + ../../forms/setupwizard_register.ui \ + ../../lib/forms/TPathComboBrowse.ui \ + ../../lib/forms/TPathLineBrowse.ui \ + ../../lib/forms/TProgressWidget.ui \ ../../lib/forms/TWizard.ui -SOURCES += test-app-setup.cpp \ - ../../lib/core/ConsoleLog.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/util/optparse.c \ - ../../lib/util/optparse_helper.c \ - ../../lib/widgets/TAsideLabel.cpp \ - ../../lib/widgets/TBusyLabel.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../lib/widgets/TOkLabel.cpp \ - ../../lib/widgets/TPathComboBrowse.cpp \ - ../../lib/widgets/TPathLineBrowse.cpp \ - ../../lib/widgets/TProgressWidget.cpp \ - ../../lib/widgets/TWizard.cpp \ - ../../lib/widgets/TWizardPage.cpp \ - ../../libcperciva/util/getopt.c \ - ../../libcperciva/util/warnp.c \ - ../../src/app-setup.cpp \ - ../../src/messages/archivefilestat.h \ - ../../src/backenddata.cpp \ - ../../src/backuptask.cpp \ - ../../src/basetask.cpp \ - ../../src/cmdlinetask.cpp \ - ../../src/dir-utils.cpp \ - ../../src/filetablemodel.cpp \ - ../../src/humanbytes.cpp \ - ../../src/init-shared.cpp \ - ../../src/jobrunner.cpp \ - ../../src/parsearchivelistingtask.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/job.cpp \ - ../../src/persistentmodel/journal.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ - ../../src/persistentmodel/upgrade-store.cpp \ - ../../src/scheduling.cpp \ - ../../src/setupwizard/setupwizard.cpp \ - ../../src/setupwizard/setupwizard_cli.cpp \ - ../../src/setupwizard/setupwizard_final.cpp \ - ../../src/setupwizard/setupwizard_intro.cpp \ - ../../src/setupwizard/setupwizard_register.cpp \ - ../../src/taskmanager.cpp \ - ../../src/taskqueuer.cpp \ - ../../src/tasks/tasks-misc.cpp \ - ../../src/tasks/tasks-setup.cpp \ - ../../src/tasks/tasks-tarsnap.cpp \ - ../../src/tasks/tasks-utils.cpp \ +SOURCES += test-app-setup.cpp \ + ../../lib/core/ConsoleLog.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/util/optparse.c \ + ../../lib/util/optparse_helper.c \ + ../../lib/widgets/TAsideLabel.cpp \ + ../../lib/widgets/TBusyLabel.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../lib/widgets/TOkLabel.cpp \ + ../../lib/widgets/TPathComboBrowse.cpp \ + ../../lib/widgets/TPathLineBrowse.cpp \ + ../../lib/widgets/TProgressWidget.cpp \ + ../../lib/widgets/TWizard.cpp \ + ../../lib/widgets/TWizardPage.cpp \ + ../../libcperciva/util/getopt.c \ + ../../libcperciva/util/warnp.c \ + ../../src/app-setup.cpp \ + ../../src/messages/archivefilestat.h \ + ../../src/backenddata.cpp \ + ../../src/backuptask.cpp \ + ../../src/basetask.cpp \ + ../../src/cmdlinetask.cpp \ + ../../src/dir-utils.cpp \ + ../../src/filetablemodel.cpp \ + ../../src/humanbytes.cpp \ + ../../src/init-shared.cpp \ + ../../src/jobrunner.cpp \ + ../../src/parsearchivelistingtask.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/job.cpp \ + ../../src/persistentmodel/journal.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ + ../../src/persistentmodel/upgrade-store.cpp \ + ../../src/scheduling.cpp \ + ../../src/setupwizard/setupwizard.cpp \ + ../../src/setupwizard/setupwizard_cli.cpp \ + ../../src/setupwizard/setupwizard_final.cpp \ + ../../src/setupwizard/setupwizard_intro.cpp \ + ../../src/setupwizard/setupwizard_register.cpp \ + ../../src/taskmanager.cpp \ + ../../src/taskqueuer.cpp \ + ../../src/tasks/tasks-misc.cpp \ + ../../src/tasks/tasks-setup.cpp \ + ../../src/tasks/tasks-tarsnap.cpp \ + ../../src/tasks/tasks-utils.cpp \ ../../src/translator.cpp -HEADERS += \ - ../../lib/core/ConsoleLog.h \ - ../../lib/core/LogEntry.h \ - ../../lib/core/TSettings.h \ - ../../lib/util/optparse.h \ - ../../lib/util/optparse_helper.h \ - ../../lib/widgets/TAsideLabel.h \ - ../../lib/widgets/TBusyLabel.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../lib/widgets/TOkLabel.h \ - ../../lib/widgets/TPathComboBrowse.h \ - ../../lib/widgets/TPathLineBrowse.h \ - ../../lib/widgets/TProgressWidget.h \ - ../../lib/widgets/TWizard.h \ - ../../lib/widgets/TWizardPage.h \ - ../../libcperciva/util/getopt.h \ - ../../libcperciva/util/warnp.h \ - ../../src/app-setup.h \ - ../../src/backenddata.h \ - ../../src/backuptask.h \ - ../../src/basetask.h \ - ../../src/cmdlinetask.h \ - ../../src/dir-utils.h \ - ../../src/filetablemodel.h \ - ../../src/humanbytes.h \ - ../../src/init-shared.h \ - ../../src/jobrunner.h \ - ../../src/messages/archiveptr.h \ - ../../src/messages/archiverestoreoptions.h \ - ../../src/messages/backuptaskdataptr.h \ - ../../src/messages/jobptr.h \ - ../../src/messages/notification_info.h \ - ../../src/messages/tarsnaperror.h \ - ../../src/messages/taskstatus.h \ - ../../src/parsearchivelistingtask.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/job.h \ - ../../src/persistentmodel/journal.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ - ../../src/persistentmodel/upgrade-store.h \ - ../../src/scheduling.h \ - ../../src/setupwizard/setupwizard.h \ - ../../src/setupwizard/setupwizard_cli.h \ - ../../src/setupwizard/setupwizard_final.h \ - ../../src/setupwizard/setupwizard_intro.h \ - ../../src/setupwizard/setupwizard_register.h \ - ../../src/taskmanager.h \ - ../../src/taskqueuer.h \ - ../../src/tasks/tasks-defs.h \ - ../../src/tasks/tasks-misc.h \ - ../../src/tasks/tasks-setup.h \ - ../../src/tasks/tasks-tarsnap.h \ - ../../src/tasks/tasks-utils.h \ +HEADERS += \ + ../../lib/core/ConsoleLog.h \ + ../../lib/core/LogEntry.h \ + ../../lib/core/TSettings.h \ + ../../lib/util/optparse.h \ + ../../lib/util/optparse_helper.h \ + ../../lib/widgets/TAsideLabel.h \ + ../../lib/widgets/TBusyLabel.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../lib/widgets/TOkLabel.h \ + ../../lib/widgets/TPathComboBrowse.h \ + ../../lib/widgets/TPathLineBrowse.h \ + ../../lib/widgets/TProgressWidget.h \ + ../../lib/widgets/TWizard.h \ + ../../lib/widgets/TWizardPage.h \ + ../../libcperciva/util/getopt.h \ + ../../libcperciva/util/warnp.h \ + ../../src/app-setup.h \ + ../../src/backenddata.h \ + ../../src/backuptask.h \ + ../../src/basetask.h \ + ../../src/cmdlinetask.h \ + ../../src/dir-utils.h \ + ../../src/filetablemodel.h \ + ../../src/humanbytes.h \ + ../../src/init-shared.h \ + ../../src/jobrunner.h \ + ../../src/messages/archiveptr.h \ + ../../src/messages/archiverestoreoptions.h \ + ../../src/messages/backuptaskdataptr.h \ + ../../src/messages/jobptr.h \ + ../../src/messages/notification_info.h \ + ../../src/messages/tarsnaperror.h \ + ../../src/messages/taskstatus.h \ + ../../src/parsearchivelistingtask.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/job.h \ + ../../src/persistentmodel/journal.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ + ../../src/persistentmodel/upgrade-store.h \ + ../../src/scheduling.h \ + ../../src/setupwizard/setupwizard.h \ + ../../src/setupwizard/setupwizard_cli.h \ + ../../src/setupwizard/setupwizard_final.h \ + ../../src/setupwizard/setupwizard_intro.h \ + ../../src/setupwizard/setupwizard_register.h \ + ../../src/taskmanager.h \ + ../../src/taskqueuer.h \ + ../../src/tasks/tasks-defs.h \ + ../../src/tasks/tasks-misc.h \ + ../../src/tasks/tasks-setup.h \ + ../../src/tasks/tasks-tarsnap.h \ + ../../src/tasks/tasks-utils.h \ ../../src/translator.h -RESOURCES += \ - ../../lib/resources/lib-resources.qrc \ +RESOURCES += \ + ../../lib/resources/lib-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/archivestabwidget/test-archivestabwidget.pro b/tests/archivestabwidget/test-archivestabwidget.pro index df292e95..c86f3d10 100644 --- a/tests/archivestabwidget/test-archivestabwidget.pro +++ b/tests/archivestabwidget/test-archivestabwidget.pro @@ -3,56 +3,56 @@ QT = core gui widgets sql VALGRIND = true -FORMS += \ - ../../forms/archivelistwidgetitem.ui \ - ../../forms/archivestabwidget.ui \ - ../../forms/archivewidget.ui \ +FORMS += \ + ../../forms/archivelistwidgetitem.ui \ + ../../forms/archivestabwidget.ui \ + ../../forms/archivewidget.ui \ ../../forms/restoredialog.ui RESOURCES += ../../resources/resources.qrc -HEADERS += \ - ../../lib/core/TSettings.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../src/basetask.h \ - ../../src/filetablemodel.h \ - ../../src/humanbytes.h \ - ../../src/messages/archivefilestat.h \ - ../../src/messages/archiveptr.h \ - ../../src/messages/archiverestoreoptions.h \ - ../../src/parsearchivelistingtask.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ - ../../src/persistentmodel/upgrade-store.h \ - ../../src/tasks/tasks-utils.h \ - ../../src/widgets/archivelistwidget.h \ - ../../src/widgets/archivelistwidgetitem.h \ - ../../src/widgets/archivestabwidget.h \ - ../../src/widgets/archivewidget.h \ - ../../src/widgets/elidedannotatedlabel.h \ - ../../src/widgets/elidedclickablelabel.h \ - ../../src/widgets/restoredialog.h \ +HEADERS += \ + ../../lib/core/TSettings.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../src/basetask.h \ + ../../src/filetablemodel.h \ + ../../src/humanbytes.h \ + ../../src/messages/archivefilestat.h \ + ../../src/messages/archiveptr.h \ + ../../src/messages/archiverestoreoptions.h \ + ../../src/parsearchivelistingtask.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ + ../../src/persistentmodel/upgrade-store.h \ + ../../src/tasks/tasks-utils.h \ + ../../src/widgets/archivelistwidget.h \ + ../../src/widgets/archivelistwidgetitem.h \ + ../../src/widgets/archivestabwidget.h \ + ../../src/widgets/archivewidget.h \ + ../../src/widgets/elidedannotatedlabel.h \ + ../../src/widgets/elidedclickablelabel.h \ + ../../src/widgets/restoredialog.h \ ../qtest-platform.h -SOURCES += test-archivestabwidget.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../src/basetask.cpp \ - ../../src/filetablemodel.cpp \ - ../../src/humanbytes.cpp \ - ../../src/parsearchivelistingtask.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ - ../../src/persistentmodel/upgrade-store.cpp \ - ../../src/tasks/tasks-utils.cpp \ - ../../src/widgets/archivelistwidget.cpp \ - ../../src/widgets/archivelistwidgetitem.cpp \ - ../../src/widgets/archivestabwidget.cpp \ - ../../src/widgets/archivewidget.cpp \ - ../../src/widgets/elidedannotatedlabel.cpp \ - ../../src/widgets/elidedclickablelabel.cpp \ +SOURCES += test-archivestabwidget.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../src/basetask.cpp \ + ../../src/filetablemodel.cpp \ + ../../src/humanbytes.cpp \ + ../../src/parsearchivelistingtask.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ + ../../src/persistentmodel/upgrade-store.cpp \ + ../../src/tasks/tasks-utils.cpp \ + ../../src/widgets/archivelistwidget.cpp \ + ../../src/widgets/archivelistwidgetitem.cpp \ + ../../src/widgets/archivestabwidget.cpp \ + ../../src/widgets/archivewidget.cpp \ + ../../src/widgets/elidedannotatedlabel.cpp \ + ../../src/widgets/elidedclickablelabel.cpp \ ../../src/widgets/restoredialog.cpp diff --git a/tests/backuptabwidget/test-backuptabwidget.pro b/tests/backuptabwidget/test-backuptabwidget.pro index b8de857f..b3aa463d 100644 --- a/tests/backuptabwidget/test-backuptabwidget.pro +++ b/tests/backuptabwidget/test-backuptabwidget.pro @@ -3,55 +3,55 @@ QT = core gui widgets sql VALGRIND = true -FORMS += ../../forms/backuptabwidget.ui \ - ../../forms/backuplistwidgetitem.ui \ - ../../forms/filepickerdialog.ui \ +FORMS += ../../forms/backuptabwidget.ui \ + ../../forms/backuplistwidgetitem.ui \ + ../../forms/filepickerdialog.ui \ ../../forms/filepickerwidget.ui -HEADERS += \ - ../../lib/core/TSettings.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../src/backuptask.h \ - ../../src/basetask.h \ - ../../src/customfilesystemmodel.h \ - ../../src/dirinfotask.h \ - ../../src/humanbytes.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/job.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ - ../../src/persistentmodel/upgrade-store.h \ - ../../src/messages/archiveptr.h \ - ../../src/messages/backuptaskdataptr.h \ - ../../src/messages/jobptr.h \ - ../../src/tasks/tasks-utils.h \ - ../../src/widgets/backuplistwidget.h \ - ../../src/widgets/backuplistwidgetitem.h \ - ../../src/widgets/backuptabwidget.h \ - ../../src/widgets/elidedclickablelabel.h \ - ../../src/widgets/filepickerdialog.h \ - ../../src/widgets/filepickerwidget.h \ +HEADERS += \ + ../../lib/core/TSettings.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../src/backuptask.h \ + ../../src/basetask.h \ + ../../src/customfilesystemmodel.h \ + ../../src/dirinfotask.h \ + ../../src/humanbytes.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/job.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ + ../../src/persistentmodel/upgrade-store.h \ + ../../src/messages/archiveptr.h \ + ../../src/messages/backuptaskdataptr.h \ + ../../src/messages/jobptr.h \ + ../../src/tasks/tasks-utils.h \ + ../../src/widgets/backuplistwidget.h \ + ../../src/widgets/backuplistwidgetitem.h \ + ../../src/widgets/backuptabwidget.h \ + ../../src/widgets/elidedclickablelabel.h \ + ../../src/widgets/filepickerdialog.h \ + ../../src/widgets/filepickerwidget.h \ ../qtest-platform.h -SOURCES += test-backuptabwidget.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../src/backuptask.cpp \ - ../../src/basetask.cpp \ - ../../src/customfilesystemmodel.cpp \ - ../../src/dirinfotask.cpp \ - ../../src/humanbytes.cpp \ - ../../src/tasks/tasks-utils.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/job.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ - ../../src/persistentmodel/upgrade-store.cpp \ - ../../src/widgets/backuplistwidget.cpp \ - ../../src/widgets/backuplistwidgetitem.cpp \ - ../../src/widgets/backuptabwidget.cpp \ - ../../src/widgets/elidedclickablelabel.cpp \ - ../../src/widgets/filepickerdialog.cpp \ +SOURCES += test-backuptabwidget.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../src/backuptask.cpp \ + ../../src/basetask.cpp \ + ../../src/customfilesystemmodel.cpp \ + ../../src/dirinfotask.cpp \ + ../../src/humanbytes.cpp \ + ../../src/tasks/tasks-utils.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/job.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ + ../../src/persistentmodel/upgrade-store.cpp \ + ../../src/widgets/backuplistwidget.cpp \ + ../../src/widgets/backuplistwidgetitem.cpp \ + ../../src/widgets/backuptabwidget.cpp \ + ../../src/widgets/elidedclickablelabel.cpp \ + ../../src/widgets/filepickerdialog.cpp \ ../../src/widgets/filepickerwidget.cpp diff --git a/tests/cli/Tarsnap.pro b/tests/cli/Tarsnap.pro index eb134b84..f7319145 100644 --- a/tests/cli/Tarsnap.pro +++ b/tests/cli/Tarsnap.pro @@ -10,84 +10,84 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" # Used in src/init-shared.cpp DEFINES += TEST_CLI -SOURCES += \ - ../../lib/core/ConsoleLog.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/util/optparse.c \ - ../../lib/util/optparse_helper.c \ - ../../libcperciva/util/getopt.c \ - ../../libcperciva/util/warnp.c \ - ../../src/app-cmdline.cpp \ - ../../src/backenddata.cpp \ - ../../src/backuptask.cpp \ - ../../src/basetask.cpp \ - ../../src/cmdlinetask.cpp \ - ../../src/filetablemodel.cpp \ - ../../src/humanbytes.cpp \ - ../../src/init-shared.cpp \ - ../../src/jobrunner.cpp \ - ../../src/main.cpp \ - ../../src/parsearchivelistingtask.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/job.cpp \ - ../../src/persistentmodel/journal.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ - ../../src/persistentmodel/upgrade-store.cpp \ - ../../src/scheduling.cpp \ - ../../src/taskmanager.cpp \ - ../../src/taskqueuer.cpp \ - ../../src/tasks/tasks-misc.cpp \ - ../../src/tasks/tasks-setup.cpp \ - ../../src/tasks/tasks-tarsnap.cpp \ - ../../src/tasks/tasks-utils.cpp \ +SOURCES += \ + ../../lib/core/ConsoleLog.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/util/optparse.c \ + ../../lib/util/optparse_helper.c \ + ../../libcperciva/util/getopt.c \ + ../../libcperciva/util/warnp.c \ + ../../src/app-cmdline.cpp \ + ../../src/backenddata.cpp \ + ../../src/backuptask.cpp \ + ../../src/basetask.cpp \ + ../../src/cmdlinetask.cpp \ + ../../src/filetablemodel.cpp \ + ../../src/humanbytes.cpp \ + ../../src/init-shared.cpp \ + ../../src/jobrunner.cpp \ + ../../src/main.cpp \ + ../../src/parsearchivelistingtask.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/job.cpp \ + ../../src/persistentmodel/journal.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ + ../../src/persistentmodel/upgrade-store.cpp \ + ../../src/scheduling.cpp \ + ../../src/taskmanager.cpp \ + ../../src/taskqueuer.cpp \ + ../../src/tasks/tasks-misc.cpp \ + ../../src/tasks/tasks-setup.cpp \ + ../../src/tasks/tasks-tarsnap.cpp \ + ../../src/tasks/tasks-utils.cpp \ ../../src/translator.cpp -HEADERS += \ - ../../lib/core/ConsoleLog.h \ - ../../lib/core/LogEntry.h \ - ../../lib/core/TSettings.h \ - ../../lib/util/optparse.h \ - ../../lib/util/optparse_helper.h \ - ../../libcperciva/util/getopt.h \ - ../../libcperciva/util/warnp.h \ - ../../src/app-cmdline.h \ - ../../src/backenddata.h \ - ../../src/backuptask.h \ - ../../src/basetask.h \ - ../../src/cmdlinetask.h \ - ../../src/filetablemodel.h \ - ../../src/humanbytes.h \ - ../../src/init-shared.h \ - ../../src/jobrunner.h \ - ../../src/messages/archivefilestat.h \ - ../../src/messages/archiveptr.h \ - ../../src/messages/archiverestoreoptions.h \ - ../../src/messages/backuptaskdataptr.h \ - ../../src/messages/jobptr.h \ - ../../src/messages/notification_info.h \ - ../../src/messages/tarsnaperror.h \ - ../../src/messages/taskstatus.h \ - ../../src/parsearchivelistingtask.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/job.h \ - ../../src/persistentmodel/journal.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ - ../../src/persistentmodel/upgrade-store.h \ - ../../src/scheduling.h \ - ../../src/taskmanager.h \ - ../../src/taskqueuer.h \ - ../../src/tasks/tasks-defs.h \ - ../../src/tasks/tasks-misc.h \ - ../../src/tasks/tasks-setup.h \ - ../../src/tasks/tasks-tarsnap.h \ - ../../src/tasks/tasks-utils.h \ +HEADERS += \ + ../../lib/core/ConsoleLog.h \ + ../../lib/core/LogEntry.h \ + ../../lib/core/TSettings.h \ + ../../lib/util/optparse.h \ + ../../lib/util/optparse_helper.h \ + ../../libcperciva/util/getopt.h \ + ../../libcperciva/util/warnp.h \ + ../../src/app-cmdline.h \ + ../../src/backenddata.h \ + ../../src/backuptask.h \ + ../../src/basetask.h \ + ../../src/cmdlinetask.h \ + ../../src/filetablemodel.h \ + ../../src/humanbytes.h \ + ../../src/init-shared.h \ + ../../src/jobrunner.h \ + ../../src/messages/archivefilestat.h \ + ../../src/messages/archiveptr.h \ + ../../src/messages/archiverestoreoptions.h \ + ../../src/messages/backuptaskdataptr.h \ + ../../src/messages/jobptr.h \ + ../../src/messages/notification_info.h \ + ../../src/messages/tarsnaperror.h \ + ../../src/messages/taskstatus.h \ + ../../src/parsearchivelistingtask.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/job.h \ + ../../src/persistentmodel/journal.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ + ../../src/persistentmodel/upgrade-store.h \ + ../../src/scheduling.h \ + ../../src/taskmanager.h \ + ../../src/taskqueuer.h \ + ../../src/tasks/tasks-defs.h \ + ../../src/tasks/tasks-misc.h \ + ../../src/tasks/tasks-setup.h \ + ../../src/tasks/tasks-tarsnap.h \ + ../../src/tasks/tasks-utils.h \ ../../src/translator.h 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/consolelog/test-consolelog.pro b/tests/consolelog/test-consolelog.pro index b0c3820c..ddafd099 100644 --- a/tests/consolelog/test-consolelog.pro +++ b/tests/consolelog/test-consolelog.pro @@ -3,12 +3,12 @@ QT = core VALGRIND = true -HEADERS += \ - ../../lib/core/ConsoleLog.h \ +HEADERS += \ + ../../lib/core/ConsoleLog.h \ ../../lib/core/TSettings.h -SOURCES += test-consolelog.cpp \ - ../../lib/core/ConsoleLog.cpp \ +SOURCES += test-consolelog.cpp \ + ../../lib/core/ConsoleLog.cpp \ ../../lib/core/TSettings.cpp include(../tests-include.pri) diff --git a/tests/core/test-core.pro b/tests/core/test-core.pro index cd5fc5ab..85235f19 100644 --- a/tests/core/test-core.pro +++ b/tests/core/test-core.pro @@ -3,11 +3,11 @@ QT = core VALGRIND = true -HEADERS += \ +HEADERS += \ ../../lib/core/TSettings.h -SOURCES += test-core.cpp \ - ../../lib/core/TSettings.cpp \ +SOURCES += test-core.cpp \ + ../../lib/core/TSettings.cpp \ include(../tests-include.pri) diff --git a/tests/customfilesystemmodel/test-cfsm.pro b/tests/customfilesystemmodel/test-cfsm.pro index b3dd0aed..c2c4d664 100644 --- a/tests/customfilesystemmodel/test-cfsm.pro +++ b/tests/customfilesystemmodel/test-cfsm.pro @@ -3,13 +3,13 @@ QT = core widgets VALGRIND = true -HEADERS += \ - ../../src/customfilesystemmodel.h \ - scenario-num.h \ +HEADERS += \ + ../../src/customfilesystemmodel.h \ + scenario-num.h \ run-scenario.h -SOURCES += test-cfsm.cpp \ - ../../src/customfilesystemmodel.cpp \ +SOURCES += test-cfsm.cpp \ + ../../src/customfilesystemmodel.cpp \ run-scenario.cpp include(../tests-include.pri) diff --git a/tests/helpwidget/test-helpwidget.pro b/tests/helpwidget/test-helpwidget.pro index a6cbeeaa..38392c2e 100644 --- a/tests/helpwidget/test-helpwidget.pro +++ b/tests/helpwidget/test-helpwidget.pro @@ -3,26 +3,26 @@ QT = core gui widgets VALGRIND = true -FORMS += \ - ../../forms/aboutdialog.ui \ - ../../forms/consolelogdialog.ui \ +FORMS += \ + ../../forms/aboutdialog.ui \ + ../../forms/consolelogdialog.ui \ ../../forms/helpwidget.ui RESOURCES += ../../resources/resources.qrc -HEADERS += \ - ../../lib/widgets/TPopupPushButton.h \ - ../../lib/widgets/TTextView.h \ - ../../src/widgets/aboutdialog.h \ - ../../src/widgets/consolelogdialog.h \ - ../../src/widgets/helpwidget.h \ +HEADERS += \ + ../../lib/widgets/TPopupPushButton.h \ + ../../lib/widgets/TTextView.h \ + ../../src/widgets/aboutdialog.h \ + ../../src/widgets/consolelogdialog.h \ + ../../src/widgets/helpwidget.h \ ../../tests/qtest-platform.h -SOURCES += test-helpwidget.cpp \ - ../../lib/widgets/TPopupPushButton.cpp \ - ../../lib/widgets/TTextView.cpp \ - ../../src/widgets/aboutdialog.cpp \ - ../../src/widgets/consolelogdialog.cpp \ +SOURCES += test-helpwidget.cpp \ + ../../lib/widgets/TPopupPushButton.cpp \ + ../../lib/widgets/TTextView.cpp \ + ../../src/widgets/aboutdialog.cpp \ + ../../src/widgets/consolelogdialog.cpp \ ../../src/widgets/helpwidget.cpp include(../tests-include.pri) diff --git a/tests/jobstabwidget/test-jobstabwidget.pro b/tests/jobstabwidget/test-jobstabwidget.pro index d004e22f..6d4f44ea 100644 --- a/tests/jobstabwidget/test-jobstabwidget.pro +++ b/tests/jobstabwidget/test-jobstabwidget.pro @@ -3,71 +3,71 @@ QT = core gui widgets sql network VALGRIND = true -FORMS += \ - ../../forms/archivelistwidgetitem.ui \ - ../../forms/filepickerwidget.ui \ - ../../forms/joblistwidgetitem.ui \ - ../../forms/jobstabwidget.ui \ - ../../forms/jobwidget.ui \ +FORMS += \ + ../../forms/archivelistwidgetitem.ui \ + ../../forms/filepickerwidget.ui \ + ../../forms/joblistwidgetitem.ui \ + ../../forms/jobstabwidget.ui \ + ../../forms/jobwidget.ui \ ../../forms/restoredialog.ui # Needed for the database template and icons RESOURCES += ../../resources/resources.qrc -HEADERS += \ - ../../lib/core/TSettings.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../src/backuptask.h \ - ../../src/basetask.h \ - ../../src/customfilesystemmodel.h \ - ../../src/humanbytes.h \ - ../../src/messages/archivefilestat.h \ - ../../src/messages/archiveptr.h \ - ../../src/messages/archiverestoreoptions.h \ - ../../src/messages/backuptaskdataptr.h \ - ../../src/messages/jobptr.h \ - ../../src/parsearchivelistingtask.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/job.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ - ../../src/persistentmodel/upgrade-store.h \ - ../../src/tasks/tasks-utils.h \ - ../../src/widgets/archivelistwidget.h \ - ../../src/widgets/archivelistwidgetitem.h \ - ../../src/widgets/elidedannotatedlabel.h \ - ../../src/widgets/elidedclickablelabel.h \ - ../../src/widgets/filepickerwidget.h \ - ../../src/widgets/joblistwidget.h \ - ../../src/widgets/joblistwidgetitem.h \ - ../../src/widgets/jobstabwidget.h \ - ../../src/widgets/jobwidget.h \ - ../../src/widgets/restoredialog.h \ +HEADERS += \ + ../../lib/core/TSettings.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../src/backuptask.h \ + ../../src/basetask.h \ + ../../src/customfilesystemmodel.h \ + ../../src/humanbytes.h \ + ../../src/messages/archivefilestat.h \ + ../../src/messages/archiveptr.h \ + ../../src/messages/archiverestoreoptions.h \ + ../../src/messages/backuptaskdataptr.h \ + ../../src/messages/jobptr.h \ + ../../src/parsearchivelistingtask.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/job.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ + ../../src/persistentmodel/upgrade-store.h \ + ../../src/tasks/tasks-utils.h \ + ../../src/widgets/archivelistwidget.h \ + ../../src/widgets/archivelistwidgetitem.h \ + ../../src/widgets/elidedannotatedlabel.h \ + ../../src/widgets/elidedclickablelabel.h \ + ../../src/widgets/filepickerwidget.h \ + ../../src/widgets/joblistwidget.h \ + ../../src/widgets/joblistwidgetitem.h \ + ../../src/widgets/jobstabwidget.h \ + ../../src/widgets/jobwidget.h \ + ../../src/widgets/restoredialog.h \ ../qtest-platform.h -SOURCES += test-jobstabwidget.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../src/backuptask.cpp \ - ../../src/basetask.cpp \ - ../../src/customfilesystemmodel.cpp \ - ../../src/humanbytes.cpp \ - ../../src/parsearchivelistingtask.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/job.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ - ../../src/persistentmodel/upgrade-store.cpp \ - ../../src/tasks/tasks-utils.cpp \ - ../../src/widgets/archivelistwidget.cpp \ - ../../src/widgets/archivelistwidgetitem.cpp \ - ../../src/widgets/elidedannotatedlabel.cpp \ - ../../src/widgets/elidedclickablelabel.cpp \ - ../../src/widgets/filepickerwidget.cpp \ - ../../src/widgets/joblistwidget.cpp \ - ../../src/widgets/joblistwidgetitem.cpp \ - ../../src/widgets/jobstabwidget.cpp \ - ../../src/widgets/jobwidget.cpp \ +SOURCES += test-jobstabwidget.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../src/backuptask.cpp \ + ../../src/basetask.cpp \ + ../../src/customfilesystemmodel.cpp \ + ../../src/humanbytes.cpp \ + ../../src/parsearchivelistingtask.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/job.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ + ../../src/persistentmodel/upgrade-store.cpp \ + ../../src/tasks/tasks-utils.cpp \ + ../../src/widgets/archivelistwidget.cpp \ + ../../src/widgets/archivelistwidgetitem.cpp \ + ../../src/widgets/elidedannotatedlabel.cpp \ + ../../src/widgets/elidedclickablelabel.cpp \ + ../../src/widgets/filepickerwidget.cpp \ + ../../src/widgets/joblistwidget.cpp \ + ../../src/widgets/joblistwidgetitem.cpp \ + ../../src/widgets/jobstabwidget.cpp \ + ../../src/widgets/jobwidget.cpp \ ../../src/widgets/restoredialog.cpp include(../tests-include.pri) diff --git a/tests/lib-widgets/test-lib-widgets.pro b/tests/lib-widgets/test-lib-widgets.pro index 91077fe8..4b423e21 100644 --- a/tests/lib-widgets/test-lib-widgets.pro +++ b/tests/lib-widgets/test-lib-widgets.pro @@ -3,42 +3,42 @@ QT = core gui widgets VALGRIND = true -FORMS += \ - ../../lib/forms/TPathComboBrowse.ui \ - ../../lib/forms/TPathLineBrowse.ui \ - ../../lib/forms/TProgressWidget.ui \ - ../../lib/forms/TTabWidget.ui \ +FORMS += \ + ../../lib/forms/TPathComboBrowse.ui \ + ../../lib/forms/TPathLineBrowse.ui \ + ../../lib/forms/TProgressWidget.ui \ + ../../lib/forms/TTabWidget.ui \ ../../lib/forms/TWizard.ui -RESOURCES += ../../lib/resources/lib-resources.qrc \ +RESOURCES += ../../lib/resources/lib-resources.qrc \ ../../resources/resources.qrc -HEADERS += \ - ../../lib/widgets/TAsideLabel.h \ - ../../lib/widgets/TBusyLabel.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../lib/widgets/TOkLabel.h \ - ../../lib/widgets/TPathComboBrowse.h \ - ../../lib/widgets/TPathLineBrowse.h \ - ../../lib/widgets/TProgressWidget.h \ - ../../lib/widgets/TTabWidget.h \ - ../../lib/widgets/TTextView.h \ - ../../lib/widgets/TWizard.h \ - ../../lib/widgets/TWizardPage.h \ +HEADERS += \ + ../../lib/widgets/TAsideLabel.h \ + ../../lib/widgets/TBusyLabel.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../lib/widgets/TOkLabel.h \ + ../../lib/widgets/TPathComboBrowse.h \ + ../../lib/widgets/TPathLineBrowse.h \ + ../../lib/widgets/TProgressWidget.h \ + ../../lib/widgets/TTabWidget.h \ + ../../lib/widgets/TTextView.h \ + ../../lib/widgets/TWizard.h \ + ../../lib/widgets/TWizardPage.h \ ../../tests/qtest-platform.h -SOURCES += test-lib-widgets.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TAsideLabel.cpp \ - ../../lib/widgets/TBusyLabel.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../lib/widgets/TOkLabel.cpp \ - ../../lib/widgets/TPathComboBrowse.cpp \ - ../../lib/widgets/TPathLineBrowse.cpp \ - ../../lib/widgets/TProgressWidget.cpp \ - ../../lib/widgets/TTabWidget.cpp \ - ../../lib/widgets/TTextView.cpp \ - ../../lib/widgets/TWizard.cpp \ +SOURCES += test-lib-widgets.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TAsideLabel.cpp \ + ../../lib/widgets/TBusyLabel.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../lib/widgets/TOkLabel.cpp \ + ../../lib/widgets/TPathComboBrowse.cpp \ + ../../lib/widgets/TPathLineBrowse.cpp \ + ../../lib/widgets/TProgressWidget.cpp \ + ../../lib/widgets/TTabWidget.cpp \ + ../../lib/widgets/TTextView.cpp \ + ../../lib/widgets/TWizard.cpp \ ../../lib/widgets/TWizardPage.cpp include(../tests-include.pri) diff --git a/tests/mainwindow/test-mainwindow.pro b/tests/mainwindow/test-mainwindow.pro index e3107ecd..c9040251 100644 --- a/tests/mainwindow/test-mainwindow.pro +++ b/tests/mainwindow/test-mainwindow.pro @@ -6,144 +6,144 @@ VALGRIND = true # For TarsnapAccount DEFINES += APP_VERSION=\\\"$$VERSION\\\" -FORMS += \ - ../../forms/aboutdialog.ui \ - ../../forms/archivelistwidgetitem.ui \ - ../../forms/archivestabwidget.ui \ - ../../forms/archivewidget.ui \ - ../../forms/backuplistwidgetitem.ui \ - ../../forms/backuptabwidget.ui \ - ../../forms/consolelogdialog.ui \ - ../../forms/filepickerdialog.ui \ - ../../forms/filepickerwidget.ui \ - ../../forms/helpwidget.ui \ - ../../forms/joblistwidgetitem.ui \ - ../../forms/jobstabwidget.ui \ - ../../forms/jobwidget.ui \ - ../../forms/logindialog.ui \ - ../../forms/mainwindow.ui \ - ../../forms/restoredialog.ui \ - ../../forms/settingswidget.ui \ - ../../forms/statisticsdialog.ui \ - ../../forms/statusbarwidget.ui \ - ../../forms/stoptasksdialog.ui \ +FORMS += \ + ../../forms/aboutdialog.ui \ + ../../forms/archivelistwidgetitem.ui \ + ../../forms/archivestabwidget.ui \ + ../../forms/archivewidget.ui \ + ../../forms/backuplistwidgetitem.ui \ + ../../forms/backuptabwidget.ui \ + ../../forms/consolelogdialog.ui \ + ../../forms/filepickerdialog.ui \ + ../../forms/filepickerwidget.ui \ + ../../forms/helpwidget.ui \ + ../../forms/joblistwidgetitem.ui \ + ../../forms/jobstabwidget.ui \ + ../../forms/jobwidget.ui \ + ../../forms/logindialog.ui \ + ../../forms/mainwindow.ui \ + ../../forms/restoredialog.ui \ + ../../forms/settingswidget.ui \ + ../../forms/statisticsdialog.ui \ + ../../forms/statusbarwidget.ui \ + ../../forms/stoptasksdialog.ui \ ../../lib/forms/TTabWidget.ui -RESOURCES += \ - ../../lib/resources/lib-resources.qrc \ +RESOURCES += \ + ../../lib/resources/lib-resources.qrc \ ../../resources/resources.qrc -HEADERS += \ - ../../lib/core/ConsoleLog.h \ - ../../lib/core/TSettings.h \ - ../../lib/widgets/TBusyLabel.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../lib/widgets/TPopupPushButton.h \ - ../../lib/widgets/TTabWidget.h \ - ../../lib/widgets/TTextView.h \ - ../../src/backuptask.h \ - ../../src/basetask.h \ - ../../src/customfilesystemmodel.h \ - ../../src/dir-utils.h \ - ../../src/dirinfotask.h \ - ../../src/filetablemodel.h \ - ../../src/humanbytes.h \ - ../../src/messages/archivefilestat.h \ - ../../src/messages/archiveptr.h \ - ../../src/messages/archiverestoreoptions.h \ - ../../src/messages/backuptaskdataptr.h \ - ../../src/messages/jobptr.h \ - ../../src/messages/notification_info.h \ - ../../src/parsearchivelistingtask.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/job.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ - ../../src/persistentmodel/upgrade-store.h \ - ../../src/scheduling.h \ - ../../src/tarsnapaccount.h \ - ../../src/tasks/tasks-utils.h \ - ../../src/translator.h \ - ../../src/widgets/aboutdialog.h \ - ../../src/widgets/archivelistwidget.h \ - ../../src/widgets/archivelistwidgetitem.h \ - ../../src/widgets/archivestabwidget.h \ - ../../src/widgets/archivewidget.h \ - ../../src/widgets/backuplistwidget.h \ - ../../src/widgets/backuplistwidgetitem.h \ - ../../src/widgets/backuptabwidget.h \ - ../../src/widgets/confirmationdialog.h \ - ../../src/widgets/consolelogdialog.h \ - ../../src/widgets/elidedannotatedlabel.h \ - ../../src/widgets/elidedclickablelabel.h \ - ../../src/widgets/filepickerdialog.h \ - ../../src/widgets/filepickerwidget.h \ - ../../src/widgets/helpwidget.h \ - ../../src/widgets/joblistwidget.h \ - ../../src/widgets/joblistwidgetitem.h \ - ../../src/widgets/jobstabwidget.h \ - ../../src/widgets/jobwidget.h \ - ../../src/widgets/mainwindow.h \ - ../../src/widgets/restoredialog.h \ - ../../src/widgets/schedulingwidgets.h \ - ../../src/widgets/settingswidget.h \ - ../../src/widgets/statisticsdialog.h \ - ../../src/widgets/statusbarwidget.h \ - ../../src/widgets/stoptasksdialog.h \ - ../../src/widgets/tarsnapaccountdialog.h \ +HEADERS += \ + ../../lib/core/ConsoleLog.h \ + ../../lib/core/TSettings.h \ + ../../lib/widgets/TBusyLabel.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../lib/widgets/TPopupPushButton.h \ + ../../lib/widgets/TTabWidget.h \ + ../../lib/widgets/TTextView.h \ + ../../src/backuptask.h \ + ../../src/basetask.h \ + ../../src/customfilesystemmodel.h \ + ../../src/dir-utils.h \ + ../../src/dirinfotask.h \ + ../../src/filetablemodel.h \ + ../../src/humanbytes.h \ + ../../src/messages/archivefilestat.h \ + ../../src/messages/archiveptr.h \ + ../../src/messages/archiverestoreoptions.h \ + ../../src/messages/backuptaskdataptr.h \ + ../../src/messages/jobptr.h \ + ../../src/messages/notification_info.h \ + ../../src/parsearchivelistingtask.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/job.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ + ../../src/persistentmodel/upgrade-store.h \ + ../../src/scheduling.h \ + ../../src/tarsnapaccount.h \ + ../../src/tasks/tasks-utils.h \ + ../../src/translator.h \ + ../../src/widgets/aboutdialog.h \ + ../../src/widgets/archivelistwidget.h \ + ../../src/widgets/archivelistwidgetitem.h \ + ../../src/widgets/archivestabwidget.h \ + ../../src/widgets/archivewidget.h \ + ../../src/widgets/backuplistwidget.h \ + ../../src/widgets/backuplistwidgetitem.h \ + ../../src/widgets/backuptabwidget.h \ + ../../src/widgets/confirmationdialog.h \ + ../../src/widgets/consolelogdialog.h \ + ../../src/widgets/elidedannotatedlabel.h \ + ../../src/widgets/elidedclickablelabel.h \ + ../../src/widgets/filepickerdialog.h \ + ../../src/widgets/filepickerwidget.h \ + ../../src/widgets/helpwidget.h \ + ../../src/widgets/joblistwidget.h \ + ../../src/widgets/joblistwidgetitem.h \ + ../../src/widgets/jobstabwidget.h \ + ../../src/widgets/jobwidget.h \ + ../../src/widgets/mainwindow.h \ + ../../src/widgets/restoredialog.h \ + ../../src/widgets/schedulingwidgets.h \ + ../../src/widgets/settingswidget.h \ + ../../src/widgets/statisticsdialog.h \ + ../../src/widgets/statusbarwidget.h \ + ../../src/widgets/stoptasksdialog.h \ + ../../src/widgets/tarsnapaccountdialog.h \ ../../tests/qtest-platform.h -SOURCES += test-mainwindow.cpp \ - ../../lib/core/ConsoleLog.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TBusyLabel.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../lib/widgets/TPopupPushButton.cpp \ - ../../lib/widgets/TTabWidget.cpp \ - ../../lib/widgets/TTextView.cpp \ - ../../src/backuptask.cpp \ - ../../src/basetask.cpp \ - ../../src/customfilesystemmodel.cpp \ - ../../src/dir-utils.cpp \ - ../../src/dirinfotask.cpp \ - ../../src/filetablemodel.cpp \ - ../../src/humanbytes.cpp \ - ../../src/parsearchivelistingtask.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/job.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ - ../../src/persistentmodel/upgrade-store.cpp \ - ../../src/scheduling.cpp \ - ../../src/tarsnapaccount.cpp \ - ../../src/tasks/tasks-utils.cpp \ - ../../src/translator.cpp \ - ../../src/widgets/aboutdialog.cpp \ - ../../src/widgets/archivelistwidget.cpp \ - ../../src/widgets/archivelistwidgetitem.cpp \ - ../../src/widgets/archivestabwidget.cpp \ - ../../src/widgets/archivewidget.cpp \ - ../../src/widgets/backuplistwidget.cpp \ - ../../src/widgets/backuplistwidgetitem.cpp \ - ../../src/widgets/backuptabwidget.cpp \ - ../../src/widgets/confirmationdialog.cpp \ - ../../src/widgets/consolelogdialog.cpp \ - ../../src/widgets/elidedannotatedlabel.cpp \ - ../../src/widgets/elidedclickablelabel.cpp \ - ../../src/widgets/filepickerdialog.cpp \ - ../../src/widgets/filepickerwidget.cpp \ - ../../src/widgets/helpwidget.cpp \ - ../../src/widgets/joblistwidget.cpp \ - ../../src/widgets/joblistwidgetitem.cpp \ - ../../src/widgets/jobstabwidget.cpp \ - ../../src/widgets/jobwidget.cpp \ - ../../src/widgets/mainwindow.cpp \ - ../../src/widgets/restoredialog.cpp \ - ../../src/widgets/schedulingwidgets.cpp \ - ../../src/widgets/settingswidget.cpp \ - ../../src/widgets/statisticsdialog.cpp \ - ../../src/widgets/statusbarwidget.cpp \ - ../../src/widgets/stoptasksdialog.cpp \ +SOURCES += test-mainwindow.cpp \ + ../../lib/core/ConsoleLog.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TBusyLabel.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../lib/widgets/TPopupPushButton.cpp \ + ../../lib/widgets/TTabWidget.cpp \ + ../../lib/widgets/TTextView.cpp \ + ../../src/backuptask.cpp \ + ../../src/basetask.cpp \ + ../../src/customfilesystemmodel.cpp \ + ../../src/dir-utils.cpp \ + ../../src/dirinfotask.cpp \ + ../../src/filetablemodel.cpp \ + ../../src/humanbytes.cpp \ + ../../src/parsearchivelistingtask.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/job.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ + ../../src/persistentmodel/upgrade-store.cpp \ + ../../src/scheduling.cpp \ + ../../src/tarsnapaccount.cpp \ + ../../src/tasks/tasks-utils.cpp \ + ../../src/translator.cpp \ + ../../src/widgets/aboutdialog.cpp \ + ../../src/widgets/archivelistwidget.cpp \ + ../../src/widgets/archivelistwidgetitem.cpp \ + ../../src/widgets/archivestabwidget.cpp \ + ../../src/widgets/archivewidget.cpp \ + ../../src/widgets/backuplistwidget.cpp \ + ../../src/widgets/backuplistwidgetitem.cpp \ + ../../src/widgets/backuptabwidget.cpp \ + ../../src/widgets/confirmationdialog.cpp \ + ../../src/widgets/consolelogdialog.cpp \ + ../../src/widgets/elidedannotatedlabel.cpp \ + ../../src/widgets/elidedclickablelabel.cpp \ + ../../src/widgets/filepickerdialog.cpp \ + ../../src/widgets/filepickerwidget.cpp \ + ../../src/widgets/helpwidget.cpp \ + ../../src/widgets/joblistwidget.cpp \ + ../../src/widgets/joblistwidgetitem.cpp \ + ../../src/widgets/jobstabwidget.cpp \ + ../../src/widgets/jobwidget.cpp \ + ../../src/widgets/mainwindow.cpp \ + ../../src/widgets/restoredialog.cpp \ + ../../src/widgets/schedulingwidgets.cpp \ + ../../src/widgets/settingswidget.cpp \ + ../../src/widgets/statisticsdialog.cpp \ + ../../src/widgets/statusbarwidget.cpp \ + ../../src/widgets/stoptasksdialog.cpp \ ../../src/widgets/tarsnapaccountdialog.cpp include(../tests-include.pri) diff --git a/tests/persistent/test-persistent.pro b/tests/persistent/test-persistent.pro index 268337a5..8eec8633 100644 --- a/tests/persistent/test-persistent.pro +++ b/tests/persistent/test-persistent.pro @@ -6,24 +6,24 @@ VALGRIND = true # Needed for the database template RESOURCES += ../../resources/resources-lite.qrc -HEADERS += \ - ../../lib/core/LogEntry.h \ - ../../lib/core/TSettings.h \ - ../../src/messages/archiveptr.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/job.h \ - ../../src/persistentmodel/journal.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ +HEADERS += \ + ../../lib/core/LogEntry.h \ + ../../lib/core/TSettings.h \ + ../../src/messages/archiveptr.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/job.h \ + ../../src/persistentmodel/journal.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ ../../src/persistentmodel/upgrade-store.h -SOURCES += test-persistent.cpp \ - ../../lib/core/TSettings.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/job.cpp \ - ../../src/persistentmodel/journal.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ +SOURCES += test-persistent.cpp \ + ../../lib/core/TSettings.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/job.cpp \ + ../../src/persistentmodel/journal.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ ../../src/persistentmodel/upgrade-store.cpp include(../tests-include.pri) diff --git a/tests/settingswidget/test-settingswidget.pro b/tests/settingswidget/test-settingswidget.pro index b48b8b3a..a748e892 100644 --- a/tests/settingswidget/test-settingswidget.pro +++ b/tests/settingswidget/test-settingswidget.pro @@ -6,36 +6,36 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" VALGRIND = true -FORMS += ../../forms/settingswidget.ui \ +FORMS += ../../forms/settingswidget.ui \ ../../forms/logindialog.ui -HEADERS += \ - ../../lib/core/ConsoleLog.h \ - ../../lib/core/TSettings.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../src/dir-utils.h \ - ../../src/scheduling.h \ - ../../src/tarsnapaccount.h \ - ../../src/tasks/tasks-utils.h \ - ../../src/translator.h \ - ../../src/widgets/confirmationdialog.h \ - ../../src/widgets/schedulingwidgets.h \ - ../../src/widgets/settingswidget.h \ - ../../src/widgets/tarsnapaccountdialog.h \ +HEADERS += \ + ../../lib/core/ConsoleLog.h \ + ../../lib/core/TSettings.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../src/dir-utils.h \ + ../../src/scheduling.h \ + ../../src/tarsnapaccount.h \ + ../../src/tasks/tasks-utils.h \ + ../../src/translator.h \ + ../../src/widgets/confirmationdialog.h \ + ../../src/widgets/schedulingwidgets.h \ + ../../src/widgets/settingswidget.h \ + ../../src/widgets/tarsnapaccountdialog.h \ ../../tests/qtest-platform.h -SOURCES += test-settingswidget.cpp \ - ../../lib/core/ConsoleLog.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../src/dir-utils.cpp \ - ../../src/scheduling.cpp \ - ../../src/tarsnapaccount.cpp \ - ../../src/tasks/tasks-utils.cpp \ - ../../src/translator.cpp \ - ../../src/widgets/confirmationdialog.cpp \ - ../../src/widgets/schedulingwidgets.cpp \ - ../../src/widgets/settingswidget.cpp \ +SOURCES += test-settingswidget.cpp \ + ../../lib/core/ConsoleLog.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../src/dir-utils.cpp \ + ../../src/scheduling.cpp \ + ../../src/tarsnapaccount.cpp \ + ../../src/tasks/tasks-utils.cpp \ + ../../src/translator.cpp \ + ../../src/widgets/confirmationdialog.cpp \ + ../../src/widgets/schedulingwidgets.cpp \ + ../../src/widgets/settingswidget.cpp \ ../../src/widgets/tarsnapaccountdialog.cpp include(../tests-include.pri) diff --git a/tests/setupwizard/test-setupwizard.pro b/tests/setupwizard/test-setupwizard.pro index 77021b39..87d49b9c 100644 --- a/tests/setupwizard/test-setupwizard.pro +++ b/tests/setupwizard/test-setupwizard.pro @@ -3,60 +3,60 @@ QT = core gui widgets network VALGRIND = true -FORMS += \ - ../../forms/setupwizard.ui \ - ../../forms/setupwizard_cli.ui \ - ../../forms/setupwizard_final.ui \ - ../../forms/setupwizard_intro.ui \ - ../../forms/setupwizard_register.ui \ - ../../lib/forms/TPathComboBrowse.ui \ - ../../lib/forms/TPathLineBrowse.ui \ - ../../lib/forms/TProgressWidget.ui \ +FORMS += \ + ../../forms/setupwizard.ui \ + ../../forms/setupwizard_cli.ui \ + ../../forms/setupwizard_final.ui \ + ../../forms/setupwizard_intro.ui \ + ../../forms/setupwizard_register.ui \ + ../../lib/forms/TPathComboBrowse.ui \ + ../../lib/forms/TPathLineBrowse.ui \ + ../../lib/forms/TProgressWidget.ui \ ../../lib/forms/TWizard.ui -HEADERS += \ - compare-settings.h \ - ../../lib/core/TSettings.h \ - ../../lib/widgets/TAsideLabel.h \ - ../../lib/widgets/TBusyLabel.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../lib/widgets/TOkLabel.h \ - ../../lib/widgets/TPathComboBrowse.h \ - ../../lib/widgets/TPathLineBrowse.h \ - ../../lib/widgets/TProgressWidget.h \ - ../../lib/widgets/TWizard.h \ - ../../lib/widgets/TWizardPage.h \ - ../../src/dir-utils.h \ - ../../src/setupwizard/setupwizard.h \ - ../../src/setupwizard/setupwizard_cli.h \ - ../../src/setupwizard/setupwizard_final.h \ - ../../src/setupwizard/setupwizard_intro.h \ - ../../src/setupwizard/setupwizard_register.h \ - ../../src/tasks/tasks-utils.h \ +HEADERS += \ + compare-settings.h \ + ../../lib/core/TSettings.h \ + ../../lib/widgets/TAsideLabel.h \ + ../../lib/widgets/TBusyLabel.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../lib/widgets/TOkLabel.h \ + ../../lib/widgets/TPathComboBrowse.h \ + ../../lib/widgets/TPathLineBrowse.h \ + ../../lib/widgets/TProgressWidget.h \ + ../../lib/widgets/TWizard.h \ + ../../lib/widgets/TWizardPage.h \ + ../../src/dir-utils.h \ + ../../src/setupwizard/setupwizard.h \ + ../../src/setupwizard/setupwizard_cli.h \ + ../../src/setupwizard/setupwizard_final.h \ + ../../src/setupwizard/setupwizard_intro.h \ + ../../src/setupwizard/setupwizard_register.h \ + ../../src/tasks/tasks-utils.h \ ../../tests/qtest-platform.h -SOURCES += test-setupwizard.cpp \ - compare-settings.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TAsideLabel.cpp \ - ../../lib/widgets/TBusyLabel.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../lib/widgets/TOkLabel.cpp \ - ../../lib/widgets/TPathComboBrowse.cpp \ - ../../lib/widgets/TPathLineBrowse.cpp \ - ../../lib/widgets/TProgressWidget.cpp \ - ../../lib/widgets/TWizard.cpp \ - ../../lib/widgets/TWizardPage.cpp \ - ../../src/dir-utils.cpp \ - ../../src/setupwizard/setupwizard.cpp \ - ../../src/setupwizard/setupwizard_cli.cpp \ - ../../src/setupwizard/setupwizard_final.cpp \ - ../../src/setupwizard/setupwizard_intro.cpp \ - ../../src/setupwizard/setupwizard_register.cpp \ +SOURCES += test-setupwizard.cpp \ + compare-settings.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TAsideLabel.cpp \ + ../../lib/widgets/TBusyLabel.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../lib/widgets/TOkLabel.cpp \ + ../../lib/widgets/TPathComboBrowse.cpp \ + ../../lib/widgets/TPathLineBrowse.cpp \ + ../../lib/widgets/TProgressWidget.cpp \ + ../../lib/widgets/TWizard.cpp \ + ../../lib/widgets/TWizardPage.cpp \ + ../../src/dir-utils.cpp \ + ../../src/setupwizard/setupwizard.cpp \ + ../../src/setupwizard/setupwizard_cli.cpp \ + ../../src/setupwizard/setupwizard_final.cpp \ + ../../src/setupwizard/setupwizard_intro.cpp \ + ../../src/setupwizard/setupwizard_register.cpp \ ../../src/tasks/tasks-utils.cpp -RESOURCES += \ - ../../lib/resources/lib-resources.qrc \ +RESOURCES += \ + ../../lib/resources/lib-resources.qrc \ ../../resources/resources.qrc include(../tests-include.pri) diff --git a/tests/small-widgets/test-small-widgets.pro b/tests/small-widgets/test-small-widgets.pro index b80722b8..29c21c9d 100644 --- a/tests/small-widgets/test-small-widgets.pro +++ b/tests/small-widgets/test-small-widgets.pro @@ -3,30 +3,30 @@ QT = core gui widgets VALGRIND = true -FORMS += \ - ../../forms/filepickerdialog.ui \ - ../../forms/filepickerwidget.ui \ +FORMS += \ + ../../forms/filepickerdialog.ui \ + ../../forms/filepickerwidget.ui \ ../../forms/stoptasksdialog.ui -HEADERS += \ - ../../lib/core/TSettings.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../src/customfilesystemmodel.h \ - ../../src/widgets/confirmationdialog.h \ - ../../src/widgets/elidedannotatedlabel.h \ - ../../src/widgets/filepickerdialog.h \ - ../../src/widgets/filepickerwidget.h \ - ../../src/widgets/stoptasksdialog.h \ +HEADERS += \ + ../../lib/core/TSettings.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../src/customfilesystemmodel.h \ + ../../src/widgets/confirmationdialog.h \ + ../../src/widgets/elidedannotatedlabel.h \ + ../../src/widgets/filepickerdialog.h \ + ../../src/widgets/filepickerwidget.h \ + ../../src/widgets/stoptasksdialog.h \ ../../tests/qtest-platform.h -SOURCES += test-small-widgets.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../src/customfilesystemmodel.cpp \ - ../../src/widgets/confirmationdialog.cpp \ - ../../src/widgets/elidedannotatedlabel.cpp \ - ../../src/widgets/filepickerdialog.cpp \ - ../../src/widgets/filepickerwidget.cpp \ +SOURCES += test-small-widgets.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../src/customfilesystemmodel.cpp \ + ../../src/widgets/confirmationdialog.cpp \ + ../../src/widgets/elidedannotatedlabel.cpp \ + ../../src/widgets/filepickerdialog.cpp \ + ../../src/widgets/filepickerwidget.cpp \ ../../src/widgets/stoptasksdialog.cpp include(../tests-include.pri) diff --git a/tests/task/test-task.pro b/tests/task/test-task.pro index 7e2c9efe..66f66348 100644 --- a/tests/task/test-task.pro +++ b/tests/task/test-task.pro @@ -3,21 +3,21 @@ QT = core VALGRIND = true -HEADERS += \ - ../../lib/core/ConsoleLog.h \ - ../../lib/core/TSettings.h \ - ../../src/basetask.h \ - ../../src/cmdlinetask.h \ - ../../src/dir-utils.h \ - ../../src/tasks/tasks-utils.h \ +HEADERS += \ + ../../lib/core/ConsoleLog.h \ + ../../lib/core/TSettings.h \ + ../../src/basetask.h \ + ../../src/cmdlinetask.h \ + ../../src/dir-utils.h \ + ../../src/tasks/tasks-utils.h \ ../qtest-platform.h -SOURCES += test-task.cpp \ - ../../lib/core/ConsoleLog.cpp \ - ../../lib/core/TSettings.cpp \ - ../../src/basetask.cpp \ - ../../src/cmdlinetask.cpp \ - ../../src/dir-utils.cpp \ +SOURCES += test-task.cpp \ + ../../lib/core/ConsoleLog.cpp \ + ../../lib/core/TSettings.cpp \ + ../../src/basetask.cpp \ + ../../src/cmdlinetask.cpp \ + ../../src/dir-utils.cpp \ ../../src/tasks/tasks-utils.cpp include(../tests-include.pri) diff --git a/tests/taskmanager/test-taskmanager.pro b/tests/taskmanager/test-taskmanager.pro index b4097fb2..1df0f518 100644 --- a/tests/taskmanager/test-taskmanager.pro +++ b/tests/taskmanager/test-taskmanager.pro @@ -3,59 +3,59 @@ QT = core sql network VALGRIND = true -HEADERS += \ - ../../lib/core/ConsoleLog.h \ - ../../lib/core/TSettings.h \ - ../../src/backenddata.h \ - ../../src/backuptask.h \ - ../../src/basetask.h \ - ../../src/cmdlinetask.h \ - ../../src/dir-utils.h \ - ../../src/dirinfotask.h \ - ../../src/humanbytes.h \ - ../../src/jobrunner.h \ - ../../src/messages/archivefilestat.h \ - ../../src/messages/archiveptr.h \ - ../../src/messages/backuptaskdataptr.h \ - ../../src/messages/jobptr.h \ - ../../src/messages/notification_info.h \ - ../../src/parsearchivelistingtask.h \ - ../../src/persistentmodel/archive.h \ - ../../src/persistentmodel/job.h \ - ../../src/persistentmodel/persistentobject.h \ - ../../src/persistentmodel/persistentstore.h \ - ../../src/persistentmodel/upgrade-store.h \ - ../../src/taskmanager.h \ - ../../src/taskqueuer.h \ - ../../src/tasks/tasks-defs.h \ - ../../src/tasks/tasks-misc.h \ - ../../src/tasks/tasks-setup.h \ - ../../src/tasks/tasks-tarsnap.h \ - ../../src/tasks/tasks-utils.h \ +HEADERS += \ + ../../lib/core/ConsoleLog.h \ + ../../lib/core/TSettings.h \ + ../../src/backenddata.h \ + ../../src/backuptask.h \ + ../../src/basetask.h \ + ../../src/cmdlinetask.h \ + ../../src/dir-utils.h \ + ../../src/dirinfotask.h \ + ../../src/humanbytes.h \ + ../../src/jobrunner.h \ + ../../src/messages/archivefilestat.h \ + ../../src/messages/archiveptr.h \ + ../../src/messages/backuptaskdataptr.h \ + ../../src/messages/jobptr.h \ + ../../src/messages/notification_info.h \ + ../../src/parsearchivelistingtask.h \ + ../../src/persistentmodel/archive.h \ + ../../src/persistentmodel/job.h \ + ../../src/persistentmodel/persistentobject.h \ + ../../src/persistentmodel/persistentstore.h \ + ../../src/persistentmodel/upgrade-store.h \ + ../../src/taskmanager.h \ + ../../src/taskqueuer.h \ + ../../src/tasks/tasks-defs.h \ + ../../src/tasks/tasks-misc.h \ + ../../src/tasks/tasks-setup.h \ + ../../src/tasks/tasks-tarsnap.h \ + ../../src/tasks/tasks-utils.h \ ../qtest-platform.h -SOURCES += test-taskmanager.cpp \ - ../../lib/core/ConsoleLog.cpp \ - ../../lib/core/TSettings.cpp \ - ../../src/backenddata.cpp \ - ../../src/backuptask.cpp \ - ../../src/basetask.cpp \ - ../../src/cmdlinetask.cpp \ - ../../src/dir-utils.cpp \ - ../../src/dirinfotask.cpp \ - ../../src/humanbytes.cpp \ - ../../src/jobrunner.cpp \ - ../../src/parsearchivelistingtask.cpp \ - ../../src/persistentmodel/archive.cpp \ - ../../src/persistentmodel/job.cpp \ - ../../src/persistentmodel/persistentobject.cpp \ - ../../src/persistentmodel/persistentstore.cpp \ - ../../src/persistentmodel/upgrade-store.cpp \ - ../../src/taskmanager.cpp \ - ../../src/taskqueuer.cpp \ - ../../src/tasks/tasks-misc.cpp \ - ../../src/tasks/tasks-setup.cpp \ - ../../src/tasks/tasks-tarsnap.cpp \ +SOURCES += test-taskmanager.cpp \ + ../../lib/core/ConsoleLog.cpp \ + ../../lib/core/TSettings.cpp \ + ../../src/backenddata.cpp \ + ../../src/backuptask.cpp \ + ../../src/basetask.cpp \ + ../../src/cmdlinetask.cpp \ + ../../src/dir-utils.cpp \ + ../../src/dirinfotask.cpp \ + ../../src/humanbytes.cpp \ + ../../src/jobrunner.cpp \ + ../../src/parsearchivelistingtask.cpp \ + ../../src/persistentmodel/archive.cpp \ + ../../src/persistentmodel/job.cpp \ + ../../src/persistentmodel/persistentobject.cpp \ + ../../src/persistentmodel/persistentstore.cpp \ + ../../src/persistentmodel/upgrade-store.cpp \ + ../../src/taskmanager.cpp \ + ../../src/taskqueuer.cpp \ + ../../src/tasks/tasks-misc.cpp \ + ../../src/tasks/tasks-setup.cpp \ + ../../src/tasks/tasks-tarsnap.cpp \ ../../src/tasks/tasks-utils.cpp include(../tests-include.pri) diff --git a/tests/tests-include.pri b/tests/tests-include.pri index cd914764..6a51edd8 100644 --- a/tests/tests-include.pri +++ b/tests/tests-include.pri @@ -5,11 +5,11 @@ CONFIG += c++11 debug TEMPLATE = app -INCLUDEPATH += . \ - ../../lib/core/ \ - ../../lib/util/ \ - ../../lib/widgets/ \ - ../../libcperciva/util/ \ +INCLUDEPATH += . \ + ../../lib/core/ \ + ../../lib/util/ \ + ../../lib/widgets/ \ + ../../libcperciva/util/ \ ../../src/ @@ -32,9 +32,9 @@ DEFINES += "TEST_NAME=\\\"$${TARGET}\\\"" test_home_prep.commands = rm -rf "$${TEST_HOME}/$${TARGET}" # XDG_*_HOME uses a custom "home" directory to store data, thereby not messing # up user-wide files. -TEST_ENV = XDG_CONFIG_HOME=$${TEST_HOME} \ - XDG_CACHE_HOME=$${TEST_HOME} \ - XDG_DATA_HOME=$${TEST_HOME} \ +TEST_ENV = XDG_CONFIG_HOME=$${TEST_HOME} \ + XDG_CACHE_HOME=$${TEST_HOME} \ + XDG_DATA_HOME=$${TEST_HOME} \ XDG_RUNTIME_DIR=$${TEST_HOME} contains(QT, gui) || contains(QT, widgets) { diff --git a/tests/translations/test-translations.pro b/tests/translations/test-translations.pro index 664753a1..a0f9e425 100644 --- a/tests/translations/test-translations.pro +++ b/tests/translations/test-translations.pro @@ -3,28 +3,28 @@ QT = core gui widgets VALGRIND = true -FORMS += \ +FORMS += \ ../../lib/forms/TPathComboBrowse.ui -HEADERS += \ - ../../lib/core/TSettings.h \ - ../../lib/widgets/TElidedLabel.h \ - ../../lib/widgets/TOkLabel.h \ - ../../lib/widgets/TPathComboBrowse.h \ - ../../src/translator.cpp \ - ../../src/widgets/confirmationdialog.h \ +HEADERS += \ + ../../lib/core/TSettings.h \ + ../../lib/widgets/TElidedLabel.h \ + ../../lib/widgets/TOkLabel.h \ + ../../lib/widgets/TPathComboBrowse.h \ + ../../src/translator.cpp \ + ../../src/widgets/confirmationdialog.h \ ../../tests/qtest-platform.h -SOURCES += test-translations.cpp \ - ../../lib/core/TSettings.cpp \ - ../../lib/widgets/TElidedLabel.cpp \ - ../../lib/widgets/TOkLabel.cpp \ - ../../lib/widgets/TPathComboBrowse.cpp \ - ../../src/translator.cpp \ +SOURCES += test-translations.cpp \ + ../../lib/core/TSettings.cpp \ + ../../lib/widgets/TElidedLabel.cpp \ + ../../lib/widgets/TOkLabel.cpp \ + ../../lib/widgets/TPathComboBrowse.cpp \ + ../../src/translator.cpp \ ../../src/widgets/confirmationdialog.cpp -RESOURCES += \ - ../../lib/resources/lib-resources.qrc \ +RESOURCES += \ + ../../lib/resources/lib-resources.qrc \ ../../resources/resources.qrc include(../tests-include.pri)