From b1346c64ec12a77d3c18ff9a22aa76a9e4f8613b Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 14 Sep 2019 17:21:25 +0300 Subject: [PATCH] restore qmake support --- Etalons/qmake/ccache.pri | 1 + QuasarApp.pro | 16 ++++++++-------- QuasarLib.pri | 1 - 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Etalons/qmake/ccache.pri b/Etalons/qmake/ccache.pri index 20f0d64..757d057 100755 --- a/Etalons/qmake/ccache.pri +++ b/Etalons/qmake/ccache.pri @@ -11,6 +11,7 @@ CCACHE_INCLUDE = 1 contains(QMAKE_HOST.os, Linux):{ BIN = $$system(which ccache) + !isEmpty(BIN) { message(ccache detected in $$BIN) QMAKE_CXX='$$BIN $$QMAKE_CXX' diff --git a/QuasarApp.pro b/QuasarApp.pro index f671397..7899954 100644 --- a/QuasarApp.pro +++ b/QuasarApp.pro @@ -34,18 +34,18 @@ CONFIG(release, debug|release): { SOURCES += \ quasarapp.cpp \ - params.cpp \ - locales.cpp \ - settings.cpp \ - global.cpp + params.cpp \ + locales.cpp \ + settings.cpp \ + global.cpp HEADERS += \ quasarapp.h \ quasarapp_global.h \ - params.h \ - locales.h \ - settings.h \ - global.h + params.h \ + locales.h \ + settings.h \ + global.h DISTFILES += \ QuasarLib.pri \ diff --git a/QuasarLib.pri b/QuasarLib.pri index 708196d..62c2055 100644 --- a/QuasarLib.pri +++ b/QuasarLib.pri @@ -19,7 +19,6 @@ unix:LIBS += -L$$QUASARAPP_LIB_OUTPUT_DIR -lQuasarApp win32:LIBS += -L$$QUASARAPP_LIB_OUTPUT_DIR -lQuasarApp1 - INCLUDEPATH += "$$PWD/" include(Etalons/qmake/ccache.pri);