[PATCH] simpify unix world conditionals in qmake files.

Gbp-Pq: Name 831.patch

diff --git a/GPSBabel.pro b/GPSBabel.pro
index 98b25c7d27f68daf8e928a16c4db2b9b090888f4..0ee8522d83ec331cd27d79b02c44cb68302954a0 100644 (file)
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -281,7 +281,7 @@ HEADERS += $$FILTER_HEADERS
 
 CONFIG(release, debug|release): DEFINES *= NDEBUG
 
-macx|linux|openbsd {
+unix {
   if (equals(MAKEFILE_GENERATOR, XCODE)) {
     # "Configure tests are not supported with the XCODE Makefile generator"
     # assume we have the following headers
@@ -354,7 +354,7 @@ QMAKE_EXTRA_TARGETS += check-vtesto
 QMAKE_CLEAN += $${OUT_PWD}/testo.d/*.vglog
 
 # build the compilation data base used by clang tools including clang-tidy.
-macx|linux|openbsd{
+unix {
   compile_command_database.target = compile_commands.json
   compile_command_database.commands = $(MAKE) clean; bear $(MAKE)
   QMAKE_EXTRA_TARGETS += compile_command_database

diff --git a/libusb.pri b/libusb.pri
index a6604f94bcc710f96255cf8cacd399fd3dd44036..9d589001fefb4db11eed47bcc7d63feabbf0cfe4 100644 (file)
--- a/libusb.pri
+++ b/libusb.pri
@@ -1,7 +1,7 @@
-macx|linux|openbsd {
+unix {
   !defined(WITH_LIBUSB, var) {
-    macx: WITH_LIBUSB = included
-    linux|openbsd: WITH_LIBUSB = system
+    mac: WITH_LIBUSB = included
+    !mac: WITH_LIBUSB = system
   }
   equals(WITH_LIBUSB, no) {
     message("libusb-1.0 disabled")
@@ -14,7 +14,7 @@ macx|linux|openbsd {
       PKGCONFIG += libusb-1.0
       DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(<libusb.h>)
     } else {
-      linux|openbsd {
+      !mac {
         equals(WITH_LIBUSB, system) {
           LIBS += "-lusb-1.0"
           DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(<libusb-1.0/libusb.h>)
@@ -27,7 +27,7 @@ macx|linux|openbsd {
         }
       }
 
-      macx {
+      mac {
         equals(WITH_LIBUSB, included) {
           # TODO: It would be better to create an archive and link to it
           #       to separate library build requirements from gpsbabel requirements.