Followup to ea00b36; only replace Q_WS_X11 with Q_OS_UNIX for non-Mac

- QgsMapToolOffsetCurve fix not needed, works OK on Mac
qgis · Feb 19, 2015 · c89688a · c89688a
1 parent ad86ffe
commit c89688a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -606,7 +606,7 @@ int main( int argc, char *argv[] )
   // Initialise the application and the translation stuff
   /////////////////////////////////////////////////////////////////////
 
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
   bool myUseGuiFlag = getenv( "DISPLAY" ) != 0;
 #else
   bool myUseGuiFlag = true;

diff --git a/src/app/qgisappstylesheet.cpp b/src/app/qgisappstylesheet.cpp
@@ -262,7 +262,7 @@ void QgisAppStyleSheet::setActiveValues()
 #endif
 
   // window servers
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
   mX11WS = true;
 #else
   mX11WS = false;