diff --git a/.gitignore b/.gitignore index 318fdbd7..916badd7 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,6 @@ tests/unit_tests/coverage* *.qmlc *.jsc .qmake.stash +parts +prime +stage diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri index a3376fad..9011ede4 100644 --- a/3rdparty/3rdparty.pri +++ b/3rdparty/3rdparty.pri @@ -84,7 +84,12 @@ unix:!macx { # ubuntu & debian LIBS += $$BREAKPADDIR/client/linux/libbreakpad_client.a # Unix signal watcher - HEADERS += $$PWD/qt-unix-signals/sigwatch.h - SOURCES += $$PWD/qt-unix-signals/sigwatch.cpp - INCLUDEPATH += $$PWD/qt-unix-signals/ + defined(LINUX_SIGNALS, var) { + DEFINES += LINUX_SIGNALS + + HEADERS += $$PWD/qt-unix-signals/sigwatch.h + HEADERS += $$PWD/qt-unix-signals/sigwatch_p.h + SOURCES += $$PWD/qt-unix-signals/sigwatch.cpp + INCLUDEPATH += $$PWD/qt-unix-signals/ + } } diff --git a/src/main.cpp b/src/main.cpp index 0b9d5418..1b1b62be 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ #include "app/app.h" #include "modules/crashhandler/crashhandler.h" -#ifdef Q_OS_LINUX +#ifdef LINUX_SIGNALS #include #endif @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) a.initModels(); a.initQml(); - #ifdef Q_OS_LINUX + #ifdef LINUX_SIGNALS UnixSignalWatcher sigwatch; sigwatch.watchForSignal(SIGINT); sigwatch.watchForSignal(SIGTERM); diff --git a/src/rdm.pro b/src/rdm.pro index 3b07c63e..34caa1f4 100644 --- a/src/rdm.pro +++ b/src/rdm.pro @@ -97,8 +97,8 @@ unix:!macx { # ubuntu & debian QMAKE_CXXFLAGS += -Wno-sign-compare - release: DESTDIR = ./../bin/linux/release - debug: DESTDIR = ./../bin/linux/debug + release: DESTDIR = $$PWD/../bin/linux/release + debug: DESTDIR = $$PWD/../bin/linux/debug #deployment target.path = /usr/share/redis-desktop-manager/bin