From 741b408ef13b37e9ad1ff3a849cb6e0095aa90a3 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 9 Apr 2010 17:54:34 +0000 Subject: [PATCH] fix for Linux --- src/chatdlg.h | 2 +- src/clientsettingsdlg.h | 2 +- src/llconclientdlg.h | 2 +- src/llconserverdlg.h | 2 +- src/main.cpp | 2 +- src/util.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chatdlg.h b/src/chatdlg.h index 4e52646d..70af145b 100755 --- a/src/chatdlg.h +++ b/src/chatdlg.h @@ -33,7 +33,7 @@ #ifdef _WIN32 # include "../windows/moc/chatdlgbase.h" #else -# if defined ( _IS_QMAKE_CONFIG ) +# ifdef _IS_QMAKE_CONFIG # include "ui_chatdlgbase.h" # else # include "moc/chatdlgbase.h" diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h index c7bc4953..438484f3 100755 --- a/src/clientsettingsdlg.h +++ b/src/clientsettingsdlg.h @@ -40,7 +40,7 @@ #ifdef _WIN32 # include "../windows/moc/clientsettingsdlgbase.h" #else -# if defined ( _IS_QMAKE_CONFIG ) +# ifdef _IS_QMAKE_CONFIG # include "ui_clientsettingsdlgbase.h" # else # include "moc/clientsettingsdlgbase.h" diff --git a/src/llconclientdlg.h b/src/llconclientdlg.h index 2d2b262a..592e05ab 100755 --- a/src/llconclientdlg.h +++ b/src/llconclientdlg.h @@ -42,7 +42,7 @@ #ifdef _WIN32 # include "../windows/moc/llconclientdlgbase.h" #else -# if defined ( _IS_QMAKE_CONFIG ) +# ifdef _IS_QMAKE_CONFIG # include "ui_llconclientdlgbase.h" # else # include "moc/llconclientdlgbase.h" diff --git a/src/llconserverdlg.h b/src/llconserverdlg.h index 02a11a1b..c01f36e5 100755 --- a/src/llconserverdlg.h +++ b/src/llconserverdlg.h @@ -36,7 +36,7 @@ #ifdef _WIN32 # include "../windows/moc/llconserverdlgbase.h" #else -# if defined ( _IS_QMAKE_CONFIG ) +# ifdef _IS_QMAKE_CONFIG # include "ui_llconserverdlgbase.h" # else # include "moc/llconserverdlgbase.h" diff --git a/src/main.cpp b/src/main.cpp index 21f2d8c9..262feedd 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -186,7 +186,7 @@ int main ( int argc, char** argv ) #endif // init resources -#if defined ( __APPLE__ ) || defined ( __MACOSX ) +#ifdef _IS_QMAKE_CONFIG Q_INIT_RESOURCE(resources); #else extern int qInitResources(); diff --git a/src/util.h b/src/util.h index d987c04c..e457fb27 100755 --- a/src/util.h +++ b/src/util.h @@ -40,7 +40,7 @@ using namespace std; // because of the library: "vector" # include # include #else -# if defined ( _IS_QMAKE_CONFIG ) +# ifdef _IS_QMAKE_CONFIG # include "ui_aboutdlgbase.h" # else # include "moc/aboutdlgbase.h"