From a8e3cca9032b471c1efd018a75456ee9beb70b13 Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Wed, 6 Jan 2010 16:53:29 +0100
Subject: Our variables are our variables so we prefix them.

AUTODETECT_COCOA -> QT_AUTODETECT_COCOA

Reviewed-by:thiago
---
 configure                    | 2 +-
 src/corelib/global/qglobal.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index ec23103..0644cc0 100755
--- a/configure
+++ b/configure
@@ -6912,7 +6912,7 @@ fi
 
 # if both carbon and cocoa are specified, enable the autodetection code.
 if [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" -a "$CFG_MAC_CARBON" = "yes" ]; then
-    echo "#define AUTODETECT_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new"
+    echo "#define QT_AUTODETECT_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new"
 elif [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" ]; then
     echo "#define QT_MAC_USE_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new"
 fi
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 1f0b80c..e285517 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -275,7 +275,7 @@ namespace QT_NAMESPACE {}
 #  endif
 #endif
 
-#ifdef AUTODETECT_COCOA
+#ifdef QT_AUTODETECT_COCOA
 #  ifdef Q_OS_MAC64
 #    define QT_MAC_USE_COCOA 1
 #    define QT_BUILD_KEY QT_BUILD_KEY_COCOA
-- 
cgit v0.12