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-search/lumina-search.pro | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'lumina-search/lumina-search.pro') diff --git a/lumina-search/lumina-search.pro b/lumina-search/lumina-search.pro index 65d195d5..bd894a6d 100644 --- a/lumina-search/lumina-search.pro +++ b/lumina-search/lumina-search.pro @@ -1,17 +1,12 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = lumina-search -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin +target.path = $$DESTDIR$${L_BINDIR} -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} TEMPLATE = app @@ -27,18 +22,8 @@ HEADERS += MainUI.h \ FORMS += MainUI.ui \ ConfigUI.ui -INCLUDEPATH += ../libLumina $$PREFIX/include +LIBS += -lLuminaUtils -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils - -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease - - -QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina TRANSLATIONS = i18n/lumina-search_af.ts \ @@ -104,11 +89,11 @@ TRANSLATIONS = i18n/lumina-search_af.ts \ i18n/lumina-search_zh_TW.ts \ i18n/lumina-search_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/ desktop.files=lumina-search.desktop -desktop.path=$$PREFIX/share/applications/ +desktop.path=$${L_SHAREDIR}/applications/ INSTALLS += target dotrans desktop -- cgit