From 016316236a1095651c326b8471b14c2f6e5ca3c0 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Fri, 9 Apr 2010 17:45:29 +0000
Subject: [PATCH] make it possible to use qmake for Linux, too

---
 llcon.pro               | 3 ++-
 src/chatdlg.h           | 2 +-
 src/clientsettingsdlg.h | 2 +-
 src/llconclientdlg.h    | 2 +-
 src/llconserverdlg.h    | 2 +-
 src/util.h              | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/llcon.pro b/llcon.pro
index 6d4f02d7..21299453 100755
--- a/llcon.pro
+++ b/llcon.pro
@@ -9,7 +9,8 @@ INCLUDEPATH += src \
     libs/celt
 
 DEFINES += USE_ALLOCA \
-    _REENTRANT
+    _REENTRANT \
+    _IS_QMAKE_CONFIG
 
 macx {
     HEADERS += mac/sound.h
diff --git a/src/chatdlg.h b/src/chatdlg.h
index 5e7d3c2a..4e52646d 100755
--- a/src/chatdlg.h
+++ b/src/chatdlg.h
@@ -33,7 +33,7 @@
 #ifdef _WIN32
 # include "../windows/moc/chatdlgbase.h"
 #else
-# if defined ( __APPLE__ ) || defined ( __MACOSX )
+# if defined ( _IS_QMAKE_CONFIG )
 #  include "ui_chatdlgbase.h"
 # else
 #  include "moc/chatdlgbase.h"
diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h
index 92ad1959..c7bc4953 100755
--- a/src/clientsettingsdlg.h
+++ b/src/clientsettingsdlg.h
@@ -40,7 +40,7 @@
 #ifdef _WIN32
 # include "../windows/moc/clientsettingsdlgbase.h"
 #else
-# if defined ( __APPLE__ ) || defined ( __MACOSX )
+# if defined ( _IS_QMAKE_CONFIG )
 #  include "ui_clientsettingsdlgbase.h"
 # else
 #  include "moc/clientsettingsdlgbase.h"
diff --git a/src/llconclientdlg.h b/src/llconclientdlg.h
index a80e9ef1..2d2b262a 100755
--- a/src/llconclientdlg.h
+++ b/src/llconclientdlg.h
@@ -42,7 +42,7 @@
 #ifdef _WIN32
 # include "../windows/moc/llconclientdlgbase.h"
 #else
-# if defined ( __APPLE__ ) || defined ( __MACOSX )
+# if defined ( _IS_QMAKE_CONFIG )
 #  include "ui_llconclientdlgbase.h"
 # else
 #  include "moc/llconclientdlgbase.h"
diff --git a/src/llconserverdlg.h b/src/llconserverdlg.h
index 7b6a3e3b..02a11a1b 100755
--- a/src/llconserverdlg.h
+++ b/src/llconserverdlg.h
@@ -36,7 +36,7 @@
 #ifdef _WIN32
 # include "../windows/moc/llconserverdlgbase.h"
 #else
-# if defined ( __APPLE__ ) || defined ( __MACOSX )
+# if defined ( _IS_QMAKE_CONFIG )
 #  include "ui_llconserverdlgbase.h"
 # else
 #  include "moc/llconserverdlgbase.h"
diff --git a/src/util.h b/src/util.h
index ef412564..d987c04c 100755
--- a/src/util.h
+++ b/src/util.h
@@ -40,7 +40,7 @@ using namespace std; // because of the library: "vector"
 # include <windows.h>
 # include <mmsystem.h>
 #else
-# if defined ( __APPLE__ ) || defined ( __MACOSX )
+# if defined ( _IS_QMAKE_CONFIG )
 #  include "ui_aboutdlgbase.h"
 # else
 #  include "moc/aboutdlgbase.h"