From 4a94520f2e6eb55f9d651321b15ed638404a66bb Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 11 Jan 2016 15:51:52 -0500 Subject: Large cleanup of the Lumina project files and OS-detection/support systems. 1) Setup all the subprojects to use the new OS-detect.pri subfile 2) Automatically detect/set the build datetime string for the project when qmake is run. 3) Automatically read/embed the current GIT revision into the Lumina version string 4) Remove the old QtConfig shortcut function from the LuminaOS class (and all templates). --- lumina-fileinfo/lumina-fileinfo.pro | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'lumina-fileinfo/lumina-fileinfo.pro') diff --git a/lumina-fileinfo/lumina-fileinfo.pro b/lumina-fileinfo/lumina-fileinfo.pro index 34e01717..4f5afcd6 100644 --- a/lumina-fileinfo/lumina-fileinfo.pro +++ b/lumina-fileinfo/lumina-fileinfo.pro @@ -1,3 +1,5 @@ +include("$${PWD}/../OS-detect.pri") + QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent @@ -5,15 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets concurrent TARGET = lumina-fileinfo TEMPLATE = app -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin - -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} - +target.path = $$DESTDIR$${L_BINDIR} SOURCES += main.cpp\ MainUI.cpp @@ -24,18 +18,8 @@ FORMS += MainUI.ui #RESOURCES+= lumina-fileinfo.qrc -INCLUDEPATH += ../libLumina $$PREFIX/include - -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils - -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease - +LIBS += -lLuminaUtils -QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina @@ -102,8 +86,8 @@ TRANSLATIONS = i18n/lumina-fileinfo_af.ts \ i18n/lumina-fileinfo_zh_TW.ts \ i18n/lumina-fileinfo_zu.ts -dotrans.path=$$PREFIX/share/Lumina-DE/i18n/ -dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/i18n/ +dotrans.path=$${L_SHAREDIR}/Lumina-DE/i18n/ +dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/i18n/ INSTALLS += target dotrans -- cgit