From aa1ce57c45285981dc2d4dc7eea16e41bc1bc218 Mon Sep 17 00:00:00 2001 From: tuxmaster Date: Mon, 30 Dec 2013 01:09:44 +0100 Subject: [PATCH 3/3] - make the .pro file near to QtCreator style - make it ready for Qt 5 --- src/qt-console/bat.pro.in | 100 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 31 deletions(-) diff --git a/src/qt-console/bat.pro.in b/src/qt-console/bat.pro.in index bd19c95..2736fc6 100644 --- a/src/qt-console/bat.pro.in +++ b/src/qt-console/bat.pro.in @@ -6,6 +6,8 @@ # # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + CONFIG += qt CONFIG -= debug_and_release CONFIG( debug, debug|release ) { @@ -43,34 +45,60 @@ macx { } RESOURCES = main.qrc -MOC_DIR = moc -OBJECTS_DIR = obj -UI_DIR = ui + +# make the build cleaner +UI_DIR=tmp/ui +MOC_DIR=tmp/moc +OBJECTS_DIR=tmp/obj +RCC_DIR=tmp/rcc + # Main window -FORMS += main.ui -FORMS += prefs.ui -FORMS += label/label.ui -FORMS += relabel/relabel.ui -FORMS += mount/mount.ui -FORMS += console/console.ui -FORMS += restore/restore.ui restore/prerestore.ui restore/brestore.ui -FORMS += restore/runrestore.ui -FORMS += restore/restoretree.ui -FORMS += run/run.ui run/runcmd.ui run/estimate.ui run/prune.ui -FORMS += select/select.ui select/textinput.ui -FORMS += medialist/medialist.ui mediaedit/mediaedit.ui joblist/joblist.ui -FORMS += medialist/mediaview.ui -FORMS += clients/clients.ui storage/storage.ui fileset/fileset.ui -FORMS += joblog/joblog.ui jobs/jobs.ui job/job.ui -FORMS += help/help.ui mediainfo/mediainfo.ui -FORMS += status/dirstat.ui storage/content.ui -FORMS += status/clientstat.ui -FORMS += status/storstat.ui +FORMS += main.ui \ + prefs.ui \ + label/label.ui \ + relabel/relabel.ui \ + mount/mount.ui \ + console/console.ui \ + restore/restore.ui \ + restore/prerestore.ui \ + restore/brestore.ui \ + restore/runrestore.ui \ + restore/restoretree.ui \ + run/run.ui \ + run/runcmd.ui \ + run/estimate.ui \ + run/prune.ui \ + select/select.ui \ + select/textinput.ui \ + medialist/medialist.ui \ + mediaedit/mediaedit.ui \ + joblist/joblist.ui \ + medialist/mediaview.ui \ + clients/clients.ui \ + storage/storage.ui \ + fileset/fileset.ui \ + joblog/joblog.ui \ + jobs/jobs.ui \ + job/job.ui \ + help/help.ui \ + mediainfo/mediainfo.ui \ + status/dirstat.ui \ + storage/content.ui \ + status/clientstat.ui \ + status/storstat.ui # Main directory -HEADERS += mainwin.h bat.h bat_conf.h qstd.h pages.h -SOURCES += main.cpp bat_conf.cpp mainwin.cpp qstd.cpp pages.cpp +HEADERS += mainwin.h \ + bat.h \ + bat_conf.h \ + qstd.h \ + pages.h +SOURCES += main.cpp \ + bat_conf.cpp \ + mainwin.cpp \ + qstd.cpp \ + pages.cpp # bcomm HEADERS += bcomm/dircomm.h @@ -82,7 +110,9 @@ SOURCES += console/console.cpp # Restore HEADERS += restore/restore.h -SOURCES += restore/prerestore.cpp restore/restore.cpp restore/brestore.cpp +SOURCES += restore/prerestore.cpp \ + restore/restore.cpp \ + restore/brestore.cpp # Label dialog HEADERS += label/label.h @@ -98,11 +128,16 @@ SOURCES += mount/mount.cpp # Run dialog HEADERS += run/run.h -SOURCES += run/run.cpp run/runcmd.cpp run/estimate.cpp run/prune.cpp +SOURCES += run/run.cpp \ + run/runcmd.cpp \ + run/estimate.cpp \ + run/prune.cpp # Select dialog -HEADERS += select/select.h select/textinput.h -SOURCES += select/select.cpp select/textinput.cpp +HEADERS += select/select.h \ + select/textinput.h +SOURCES += select/select.cpp \ + select/textinput.cpp ## MediaList HEADERS += medialist/medialist.h @@ -173,11 +208,14 @@ HEADERS += status/storstat.h SOURCES += status/storstat.cpp # Utility sources -HEADERS += util/fmtwidgetitem.h util/comboutil.h -SOURCES += util/fmtwidgetitem.cpp util/comboutil.cpp +HEADERS += util/fmtwidgetitem.h \ + util/comboutil.h +SOURCES += util/fmtwidgetitem.cpp \ + util/comboutil.cpp INSTALLS = bins confs help icons desktopentries QMAKE_EXTRA_TARGETS += depend -TRANSLATIONS += ts/bat_fr.ts ts/bat_de.ts +TRANSLATIONS += ts/bat_fr.ts \ + ts/bat_de.ts -- 1.8.3.1